drop sshd.pid in $GLOBUS_LOCATION/var: don't hard-code the location at

configure time but instead determine it in init_pathnames() at run-time

diff --git a/openssh/Makefile.in b/openssh/Makefile.in
index 9ec030cef7328b051a500f8f7bcadab8f6a31d82..f661fba533524a60a60a978f70ac9200797837a3 100644 (file)
--- a/openssh/Makefile.in
+++ b/openssh/Makefile.in
@@ -32,8 +32,7 @@ PRIVSEP_PATH=/var/empty
 SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@
 STRIP_OPT=@STRIP_OPT@
 
-PATHS= -D_PATH_SSH_PIDDIR=\"$(piddir)\" \
-       -D_PATH_PRIVSEP_CHROOT_DIR=\"$(PRIVSEP_PATH)\"
+PATHS= -D_PATH_PRIVSEP_CHROOT_DIR=\"$(PRIVSEP_PATH)\"
 
 CC=@CC@
 LD=@LD@

diff --git a/openssh/acconfig.h b/openssh/acconfig.h
index 61a8ef70a257c26a8dc5ca37f1c0e6aa78aebf50..6c5ca4b0e24001360bb78b599847024a7c1cda83 100644 (file)
--- a/openssh/acconfig.h
+++ b/openssh/acconfig.h
@@ -308,9 +308,6 @@
 /* Specify default $PATH */
 #undef USER_PATH
 
-/* Specify location of ssh.pid */
-#undef _PATH_SSH_PIDDIR
-
 /* Use IPv4 for connection by default, IPv6 can still if explicity asked */
 #undef IPV4_DEFAULT
 

diff --git a/openssh/configure.ac b/openssh/configure.ac
index 77bbbe3080f01d28525ca9821db7206a0735d382..b3876dec855a25b165e6503f399b331e2e9721b5 100644 (file)
--- a/openssh/configure.ac
+++ b/openssh/configure.ac
@@ -2538,31 +2538,6 @@ AC_ARG_WITH(bsd-auth,
        ]
 )
 
-# Where to place sshd.pid
-piddir=/var/run
-# make sure the directory exists
-if test ! -d $piddir ; then    
-       piddir=`eval echo ${sysconfdir}`
-       case $piddir in
-               NONE/*) piddir=`echo $piddir | sed "s~NONE~$ac_default_prefix~"` ;;
-       esac
-fi
-
-AC_ARG_WITH(pid-dir,
-       [  --with-pid-dir=PATH     Specify location of ssh.pid file],
-       [
-               if test "x$withval" != "xno" ; then     
-                       piddir=$withval
-                       if test ! -d $piddir ; then     
-                       AC_MSG_WARN([** no $piddir directory on this system **])
-                       fi
-               fi
-       ]
-)
-
-AC_DEFINE_UNQUOTED(_PATH_SSH_PIDDIR, "$piddir")
-AC_SUBST(piddir)
-
 dnl allow user to disable some login recording features
 AC_ARG_ENABLE(lastlog,
        [  --disable-lastlog       disable use of lastlog even if detected [no]],
@@ -2810,7 +2785,6 @@ C=`eval echo ${sbindir}` ; C=`eval echo ${C}`
 D=`eval echo ${sysconfdir}` ; D=`eval echo ${D}`
 E=`eval echo ${libexecdir}/ssh-askpass` ; E=`eval echo ${E}`
 F=`eval echo ${mandir}/${mansubdir}X` ; F=`eval echo ${F}`
-G=`eval echo ${piddir}` ; G=`eval echo ${G}`
 H=`eval echo ${PRIVSEP_PATH}` ; H=`eval echo ${H}`
 I=`eval echo ${user_path}` ; I=`eval echo ${I}`
 J=`eval echo ${superuser_path}` ; J=`eval echo ${J}`
@@ -2822,7 +2796,6 @@ echo "                   System binaries: $C"
 echo "               Configuration files: $D"
 echo "                   Askpass program: $E"
 echo "                      Manual pages: $F"
-echo "                          PID file: $G"
 echo "  Privilege separation chroot path: $H"
 if test "$USES_LOGIN_CONF" = "yes" ; then
 echo "   At runtime, sshd will use the path defined in /etc/login.conf"

diff --git a/openssh/pathnames.c b/openssh/pathnames.c
index 8059f1c148421e38ffdd7ce3093f4308d772ba97..19a97372f12067904b72c98b26a71e81e5621ab9 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,6 +20,7 @@ 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_SFTP_SERVER                        = STRINIT;
@@ -74,6 +76,7 @@ init_pathnames()
     _PATH_DH_MODULI            = compose3(gl, SSHDIR, "/moduli");
     _PATH_DH_PRIMES            = compose3(gl, SSHDIR, "/primes");
     _PATH_SSH_PROGRAM          = compose3(gl, BINDIR, "/ssh");
+    _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_SFTP_SERVER          = compose3(gl, LIBEXEC, "/sftp-server");

diff --git a/openssh/pathnames.h b/openssh/pathnames.h
index 8205d93ab368f31c33c963d14b97c3b6c72312fd..fc8630f30f7f95afe77cf95e483ce5d2e50565f3 100644 (file)
--- a/openssh/pathnames.h
+++ b/openssh/pathnames.h
@@ -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

diff --git a/openssh/sshd_config b/openssh/sshd_config
index 1583c72346c6d8ad8e535a95ab7f6cdbcf43c1ee..40ecd720cda9cf6fda00bf09d8ef197b8c7045f6 100644 (file)
--- a/openssh/sshd_config
+++ b/openssh/sshd_config
@@ -93,4 +93,4 @@ X11Forwarding yes
 Subsystem      sftp    /usr/libexec/sftp-server
 
 # where to store the pid of sshd process
-PidFile                /var/run/sshd.pid
+#PidFile               /var/run/sshd.pid