added note that we added GT 3.2b compatibility in this release

[gssapi-openssh.git] / openssh / pathnames.h

diff --git a/openssh/pathnames.h b/openssh/pathnames.h
index df9b40973014e868fa355937d4b93705de5d99ef..39ff147b1c544540dee09b111390ed2bb2d9574f 100644 (file)
--- a/openssh/pathnames.h
+++ b/openssh/pathnames.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pathnames.h,v 1.11 2002/02/09 17:37:34 deraadt Exp $  */
+/*     $OpenBSD: pathnames.h,v 1.14 2004/01/30 09:48:57 markus Exp $   */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -19,10 +19,6 @@
  */
 void init_pathnames();
 
-#ifndef _PATH_SSH_PIDDIR
-#define _PATH_SSH_PIDDIR               "/var/run"
-#endif
-
 /*
  * System-wide file containing host keys of known hosts.  This file should be
  * world-readable.
@@ -50,7 +46,7 @@ extern char *_PATH_SSH_PROGRAM;
  * The process id of the daemon listening for connections is saved here to
  * make it easier to kill the correct daemon when necessary.
  */
-#define _PATH_SSH_DAEMON_PID_FILE      _PATH_SSH_PIDDIR "/sshd.pid"
+extern char *_PATH_SSH_DAEMON_PID_FILE;
 
 /*
  * The directory in user\'s home directory in which the files reside. The
@@ -119,6 +115,9 @@ extern char *_PATH_SSH_HOSTS_EQUIV;
 #define _PATH_SSH_ASKPASS_DEFAULT      "/usr/X11R6/bin/ssh-askpass"
 #endif
 
+/* Location of ssh-keysign for hostbased authentication */
+extern char *_PATH_SSH_KEY_SIGN;
+
 /* xauth for X11 forwarding */
 #ifndef _PATH_XAUTH
 #define _PATH_XAUTH                    "/usr/X11R6/bin/xauth"
@@ -137,6 +136,16 @@ extern char *_PATH_SSH_HOSTS_EQUIV;
 /* for sftp */
 extern char *_PATH_SFTP_SERVER;
 
+/* chroot directory for unprivileged user when UsePrivilegeSeparation=yes */
+#ifndef _PATH_PRIVSEP_CHROOT_DIR
+#define _PATH_PRIVSEP_CHROOT_DIR       "/var/empty"
+#endif
+
+/* for passwd change */
+#ifndef _PATH_PASSWD_PROG
+#define _PATH_PASSWD_PROG             "/usr/bin/passwd"
+#endif
+
 #ifndef _PATH_LS
 #define _PATH_LS                       "ls"
 #endif
@@ -157,3 +166,6 @@ extern char *_PATH_SFTP_SERVER;
 
 /* Path to rand helper */
 extern char *SSH_RAND_HELPER;
+
+/* Default user path that includes location of scp. */
+extern char *_PATH_STDPATH_WITH_SCP;