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

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

diff --git a/openssh/pathnames.c b/openssh/pathnames.c
index 8059f1c148421e38ffdd7ce3093f4308d772ba97..9d14d20c6273bedfccb53c6042edb10916441fe2 100644 (file)
--- a/openssh/pathnames.c
+++ b/openssh/pathnames.c
@@ -5,6 +5,7 @@
 #define BINDIR "/bin"
 #define LIBEXEC "/libexec"
 #define SSHDIR "/etc/ssh"
+#define VARDIR "/var"
 
 #define STRINIT "init_pathnames() not called!"
 
@@ -19,8 +20,10 @@ char *_PATH_HOST_RSA_KEY_FILE                = STRINIT;
 char *_PATH_DH_MODULI                  = STRINIT;
 char *_PATH_DH_PRIMES                  = STRINIT;
 char *_PATH_SSH_PROGRAM                        = STRINIT;
+char *_PATH_SSH_DAEMON_PID_FILE                = STRINIT;
 char *_PATH_SSH_SYSTEM_RC              = STRINIT;
 char *_PATH_SSH_HOSTS_EQUIV            = STRINIT;
+char *_PATH_SSH_KEY_SIGN               = STRINIT;
 char *_PATH_SFTP_SERVER                        = STRINIT;
 char *SSH_RAND_HELPER                  = STRINIT;
 char *_PATH_STDPATH_WITH_SCP           = STRINIT;
@@ -73,9 +76,11 @@ init_pathnames()
     _PATH_HOST_RSA_KEY_FILE    = compose3(gl, SSHDIR, "/ssh_host_rsa_key");
     _PATH_DH_MODULI            = compose3(gl, SSHDIR, "/moduli");
     _PATH_DH_PRIMES            = compose3(gl, SSHDIR, "/primes");
-    _PATH_SSH_PROGRAM          = compose3(gl, BINDIR, "/ssh");
+    _PATH_SSH_PROGRAM          = compose3(gl, BINDIR, "/gsissh");
+    _PATH_SSH_DAEMON_PID_FILE  = compose3(gl, VARDIR, "/sshd.pid");
     _PATH_SSH_SYSTEM_RC                = compose3(gl, SSHDIR, "/sshrc");
     _PATH_SSH_HOSTS_EQUIV      = compose3(gl, SSHDIR, "/shosts.equiv");
+    _PATH_SSH_KEY_SIGN         = compose3(gl, LIBEXEC, "/ssh-keysign");
     _PATH_SFTP_SERVER          = compose3(gl, LIBEXEC, "/sftp-server");
     SSH_RAND_HELPER            = compose3(gl, LIBEXEC, "/ssh-rand-helper");
     _PATH_STDPATH_WITH_SCP     = compose4(_PATH_STDPATH, ":", gl, BINDIR);