openssh unix dev - Feb 2001 - PATCH: make contrib/redhat/sshd.init work with older RH releases

Damien--

Attached is a patch to contrib/redhat/sshd.init which eliminates the
dependency on the success() and failure() functions from
initscripts>=4.16.  This allows sshd.init to be used for both early and
recent releases of Red Hat Linux (i've confirmed it works on both 4.2
and 5.2 as well as 6.2).

The patch also removes the 'Requires: initscripts >= 4.16' line from
contrib/redhat/openssh.spec.

After inspecting and applying, you ought to be able to remove
contrib/redhat/sshd.init-5.x.

Hang in there.

-- 
jim knoble | jmknoble at jmknoble.cx | http://www.jmknoble.cx/

if (ENOATTACH == ret) {
  flog_sender();
}

-- 
jim knoble | jmknoble at jmknoble.cx | http://www.jmknoble.cx/

Circa 2001-Feb-16 14:48:07 -0500 dixit Jim Knoble:

: Damien--
: 
: Attached is a patch to contrib/redhat/sshd.init which eliminates the
: dependency on the success() and failure() functions from
: initscripts>=4.16.  This allows sshd.init to be used for both early and
: recent releases of Red Hat Linux (i've confirmed it works on both 4.2
: and 5.2 as well as 6.2).
: 
: The patch also removes the 'Requires: initscripts >= 4.16' line
from
: contrib/redhat/openssh.spec.
: 
: After inspecting and applying, you ought to be able to remove
: contrib/redhat/sshd.init-5.x.
: 
: Hang in there.
-------------- next part --------------
--- ./contrib/redhat/openssh.spec.orig-init	Wed Feb 14 23:33:17 2001
+++ ./contrib/redhat/openssh.spec	Fri Feb 16 14:41:50 2001
@@ -57,7 +57,6 @@
 Group: System Environment/Daemons
 Obsoletes: ssh-server
 PreReq: openssh = %{version}-%{release}, chkconfig >= 0.9
-Requires: initscripts >= 4.16
 
 %package askpass
 Summary: OpenSSH X11 passphrase dialog
--- ./contrib/redhat/sshd.init.orig-init	Mon Nov 13 06:57:27 2000
+++ ./contrib/redhat/sshd.init	Fri Feb 16 14:39:25 2001
@@ -23,14 +23,46 @@
 RSA_KEY=/etc/ssh/ssh_host_rsa_key
 DSA_KEY=/etc/ssh/ssh_host_dsa_key
 PID_FILE=/var/run/sshd.pid
+my_success() {
+  local msg
+  if [ $# -gt 1 ]; then
+    msg="$2"
+  else
+    msg="done"
+  fi
+  case "`type -type success`" in
+    function)
+      success "$1"
+    ;;
+    *)
+      echo -n "${msg}"
+    ;;
+  esac
+}
+my_failure() {
+  local msg
+  if [ $# -gt 1 ]; then
+    msg="$2"
+  else
+    msg="FAILED"
+  fi
+  case "`type -type failure`" in
+    function)
+      failure "$1"
+    ;;
+    *)
+      echo -n "${msg}"
+    ;;
+  esac
+}
 do_rsa1_keygen() {
 	if ! test -f $RSA1_KEY ; then
 		echo -n "Generating SSH1 RSA host key: "
 		if $KEYGEN -q -t rsa1 -f $RSA1_KEY -C '' -N ''
>&/dev/null; then
-			success "RSA1 key generation"
+			my_success "RSA1 key generation"
 			echo
 		else
-			failure "RSA1 key generation"
+			my_failure "RSA1 key generation"
 			echo
 			exit 1
 		fi
@@ -40,10 +72,10 @@
 	if ! test -f $RSA_KEY ; then
 		echo -n "Generating SSH2 RSA host key: "
 		if $KEYGEN -q -t rsa -f $RSA_KEY -C '' -N ''
>&/dev/null; then
-			success "RSA key generation"
+			my_success "RSA key generation"
 			echo
 		else
-			failure "RSA key generation"
+			my_failure "RSA key generation"
 			echo
 			exit 1
 		fi
@@ -53,10 +85,10 @@
 	if ! test -f $DSA_KEY ; then
 		echo -n "Generating SSH2 DSA host key: "
 		if $KEYGEN -q -t dsa -f $DSA_KEY -C '' -N ''
>&/dev/null; then
-			success "DSA key generation"
+			my_success "DSA key generation"
 			echo
 		else
-			failure "DSA key generation"
+			my_failure "DSA key generation"
 			echo
 			exit 1
 		fi
@@ -75,10 +107,10 @@
 			sshd
 			RETVAL=$?
 			if [ "$RETVAL" = "0" ] ; then
-				success "sshd startup"
+				my_success "sshd startup" "sshd"
 				touch /var/lock/subsys/sshd
 			else
-				failure "sshd startup"
+				my_failure "sshd startup" ""
 			fi
 		fi
 		echo

On Fri, 16 Feb 2001, Jim Knoble wrote:
> Attached is a patch to contrib/redhat/sshd.init which eliminates the
> dependency on the success() and failure() functions from
> initscripts>=4.16.  This allows sshd.init to be used for both early and
> recent releases of Red Hat Linux (i've confirmed it works on both 4.2
> and 5.2 as well as 6.2).
Speaking of sshd.init.. I think it might be a good idea to mave some stuff
under 'case' to their own functions as Red Hat has done in their own
openssh package.

Maintainability in both directions would be better, and the file hopefully
cleaner.

I can volunteer for some merging (in pre-2.5.0 timeline) if this is
thought to be desirable.

-- 
Pekka Savola                  "Tell me of difficulties surmounted,
Netcore Oy                    not those you stumble over and fall"
Systems. Networks. Security.   -- Robert Jordan: A Crown of Swords

On Fri, 16 Feb 2001, Jim Knoble wrote:
> Attached is a patch to contrib/redhat/sshd.init which eliminates the
> dependency on the success() and failure() functions from
> initscripts>=4.16.  This allows sshd.init to be used for both early and
> recent releases of Red Hat Linux (i've confirmed it works on both 4.2
> and 5.2 as well as 6.2).
>
> The patch also removes the 'Requires: initscripts >= 4.16' line
from
> contrib/redhat/openssh.spec.
>
> After inspecting and applying, you ought to be able to remove
> contrib/redhat/sshd.init-5.x.
IMO, this is a wrong way to do this.

Rather, if we want to do this, I propose something like (sshd-funcs may
not be the best name to describe this..):

--- sshd~       Sat Feb 17 16:16:33 2001
+++ sshd        Sat Feb 17 17:07:00 2001
@@ -15,6 +15,9 @@
 # source function library
 . /etc/rc.d/init.d/functions

+# source local sshd functions
+. /etc/rc.d/init.d/sshd-funcs
+
 RETVAL=0
 prog="sshd"
---
[no further changes in the main file!]

Where sshd-funcs would redefine success, failure, action, and whatever
other things that might come up, with something of it's own, like:

---
if [ ! "`type -type success`" = "function" ]; then
  my_success "$*"
fi

if [ ! "`type -type failure`" = "function" ]; then
  my_failure "$*"
fi

my_success() {
  local msg
  if [ $# -gt 1 ]; then
    msg="$2"
  else
    msg="done"
  fi
  case "`type -type success`" in
    function)
      success "$1"
    ;;
    *)
      echo -n "${msg}"
    ;;
  esac
}

my_failure() {
  local msg
  if [ $# -gt 1 ]; then
    msg="$2"
  else
    msg="FAILED"
  fi
  case "`type -type failure`" in
    function)
      failure "$1"
    ;;
    *)
      echo -n "${msg}"
    ;;
  esac
}
---

-- 
Pekka Savola                  "Tell me of difficulties surmounted,
Netcore Oy                    not those you stumble over and fall"
Systems. Networks. Security.   -- Robert Jordan: A Crown of Swords