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 fb0b606f0952ad271142d52d57d1b29bdd1997d0..e2500aafbb91985b832a4755aa9dcf8d3f58d55a 100644 (file)
--- a/openssh/pathnames.h
+++ b/openssh/pathnames.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pathnames.h,v 1.13 2002/05/23 19:24:30 markus Exp $   */
+/* $OpenBSD: pathnames.h,v 1.17 2008/12/29 02:23:26 stevesk Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -49,7 +49,7 @@ extern char *_PATH_SSH_PROGRAM;
 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"
@@ -72,9 +72,9 @@ extern char *_PATH_SSH_DAEMON_PID_FILE;
 #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"
@@ -82,7 +82,7 @@ extern char *_PATH_SSH_DAEMON_PID_FILE;
 /*
  * 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.)
@@ -141,6 +141,11 @@ extern char *_PATH_SFTP_SERVER;
 #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