merged OPENSSH_5_2P1_GSSAPI_20090225 to GPT-branch

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

diff --git a/openssh/pathnames.h b/openssh/pathnames.h
index 4b8f26712003790756fc1d5196f214b44c01530e..e2500aafbb91985b832a4755aa9dcf8d3f58d55a 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.17 2008/12/29 02:23:26 stevesk 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,10 +46,10 @@ 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
+ * The directory in user's home directory in which the files reside. The
  * directory should be world-readable (though not all files are).
  */
 #define _PATH_SSH_USER_DIR             ".ssh"
@@ -76,9 +72,9 @@ extern char *_PATH_SSH_PROGRAM;
 #define _PATH_SSH_CLIENT_ID_RSA                ".ssh/id_rsa"
 
 /*
- * Configuration file in user\'s home directory.  This file need not be
+ * Configuration file in user's home directory.  This file need not be
  * readable by anyone but the user him/herself, but does not contain anything
- * particularly secret.  If the user\'s home directory resides on an NFS
+ * particularly secret.  If the user's home directory resides on an NFS
  * volume where root is mapped to nobody, this may need to be world-readable.
  */
 #define _PATH_SSH_USER_CONFFILE                ".ssh/config"
@@ -86,7 +82,7 @@ extern char *_PATH_SSH_PROGRAM;
 /*
  * File containing a list of those rsa keys that permit logging in as this
  * user.  This file need not be readable by anyone but the user him/herself,
- * but does not contain anything particularly secret.  If the user\'s home
+ * but does not contain anything particularly secret.  If the user's home
  * directory resides on an NFS volume where root is mapped to nobody, this
  * may need to be world-readable.  (This file is read by the daemon which is
  * running as root.)
@@ -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
@@ -154,3 +163,9 @@ extern char *_PATH_SFTP_SERVER;
 #ifndef ASKPASS_PROGRAM
 #define ASKPASS_PROGRAM         "/usr/lib/ssh/ssh-askpass"
 #endif /* ASKPASS_PROGRAM */
+
+/* Path to rand helper */
+extern char *SSH_RAND_HELPER;
+
+/* Default user path that includes location of scp. */
+extern char *_PATH_STDPATH_WITH_SCP;