4 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index bffef21b8..89da6a5cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20001107
+ - (bal) acconfig.in - removed the double "USE_PIPES" entry.
+ - (bal) sshd.init files corrected to assign $? to RETVAL.  Patch by
+   Jarno Huuskonen <jhuuskon@messi.uku.fi>
+
 20001106
  - (djm) Use Jim's new 1.0.3 askpass in Redhat RPMs
  - (djm) Manually fix up missed diff hunks (mainly RCS idents)
diff --git a/acconfig.h b/acconfig.h
index 9e95f426b..1333a4537 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -23,9 +23,6 @@
 /* Define if your password has a pw_class field */
 #undef HAVE_PW_CLASS_IN_PASSWD
 
-/* Define if your socketpair() has bugs */
-#undef USE_PIPES
-
 /* Define if your system's struct sockaddr_un has a sun_len member */
 #undef HAVE_SUN_LEN_IN_SOCKADDR_UN
 
diff --git a/contrib/redhat/sshd.init b/contrib/redhat/sshd.init
index 83c10a885..41f98ad88 100755
--- a/contrib/redhat/sshd.init
+++ b/contrib/redhat/sshd.init
@@ -72,6 +72,7 @@ case "$1" in
                 echo -n "Shutting down sshd: "
                 if [ -f $PID_FILE ] ; then
                         killproc sshd
+                        RETVAL=$?
                         [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sshd
                 fi
                 echo
diff --git a/contrib/redhat/sshd.init-5.x b/contrib/redhat/sshd.init-5.x
index e836b6919..51ded9338 100755
--- a/contrib/redhat/sshd.init-5.x
+++ b/contrib/redhat/sshd.init-5.x
@@ -39,6 +39,7 @@ case "$1" in
                 echo -n "Shutting down sshd: "
                 if [ -f /var/run/sshd.pid ] ; then
                         killproc sshd
+                        RETVAL=$?
                 fi
                 echo
                 [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sshd