o Update wrapper scripts to check for GLOBUS_LOCATION and to exec their

      real counterparts, instead of just forking them off.  This should
      help scripts who call, eg. sshd, and want to know the true pid.

diff --git a/openssh/scp.wrapper b/openssh/scp.wrapper
index 291be9628f128761b7e0d18cc8949df4d0ea88cb..fca65cf03220df1439a2ac018ead776247919deb 100644 (file)
--- a/openssh/scp.wrapper
+++ b/openssh/scp.wrapper
@@ -3,6 +3,11 @@
 # Wrapper script to ensure that the correct files are used.
 #
 
+if [ "x$GLOBUS_LOCATION" = "x" ]; then
+  echo "Set GLOBUS_LOCATION before running this script"
+  exit 1
+fi
+
 # $GLOBUS_LOCATION/bin/scp.real -S $GLOBUS_LOCATION/bin/ssh -F /etc/ssh/ssh_config $*
 
-$GLOBUS_LOCATION/bin/scp.real -S $GLOBUS_LOCATION/bin/ssh $*
+exec $GLOBUS_LOCATION/bin/scp.real -S $GLOBUS_LOCATION/bin/ssh $*

diff --git a/openssh/sftp.wrapper b/openssh/sftp.wrapper
index 8fed5bc2e60d9fa5df2169add83847e7cbea56b7..332ecf70af5b5b08665e5dfc278614e27743404f 100644 (file)
--- a/openssh/sftp.wrapper
+++ b/openssh/sftp.wrapper
@@ -3,6 +3,11 @@
 # Wrapper script to ensure that the correct files are used.
 #
 
+if [ "x$GLOBUS_LOCATION" = "x" ]; then
+  echo "Set GLOBUS_LOCATION before running this script"
+  exit 1
+fi
+
 # $GLOBUS_LOCATION/bin/sftp.real -S $GLOBUS_LOCATION/bin/ssh -F /etc/ssh/ssh_config $*
 
-$GLOBUS_LOCATION/bin/sftp.real -S $GLOBUS_LOCATION/bin/ssh $*
+exec $GLOBUS_LOCATION/bin/sftp.real -S $GLOBUS_LOCATION/bin/ssh $*

diff --git a/openssh/sshd.wrapper b/openssh/sshd.wrapper
index 99226eac7e703981529fe4c4b45924706dabb5ce..df471a25ccc098bdf98f5bc6e62f6489038d0ce9 100644 (file)
--- a/openssh/sshd.wrapper
+++ b/openssh/sshd.wrapper
@@ -7,6 +7,11 @@
 # line and comment out the second line.
 #
 
+if [ "x$GLOBUS_LOCATION" = "x" ]; then
+  echo "Set GLOBUS_LOCATION before running this script"
+  exit 1
+fi
+
 # $GLOBUS_LOCATION/sbin/sshd.real -f /etc/ssh/sshd_config $*
 
-$GLOBUS_LOCATION/sbin/sshd.real $*
+exec $GLOBUS_LOCATION/sbin/sshd.real $*