From: Jon Trulson <jon@radscan.com>
Date: Thu, 31 May 2018 23:29:14 +0000 (-0600)
Subject: configTT: remove inetd support
X-Git-Tag: 2.2.4a~6
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d2cb2b3659c49522b05e33484cc35d5e8902f1c5;p=oweals%2Fcde.git

configTT: remove inetd support
---

diff --git a/cde/admin/IntegTools/post_install/linux/configTT.src b/cde/admin/IntegTools/post_install/linux/configTT.src
index d2876c73..a1a9f64f 100755
--- a/cde/admin/IntegTools/post_install/linux/configTT.src
+++ b/cde/admin/IntegTools/post_install/linux/configTT.src
@@ -16,80 +16,6 @@ FILESET=CDE-TT
 DO_CONFIGURATION=""
 retval=0
 
-FixInetdDotConf()
-{
-FILE=/etc/inetd.conf
-TMPFILE=/tmp/inetd.conf
-TTDBSERVERD=CDE_INSTALLATION_TOP/bin/rpc.ttdbserver
-
-XCOMM
-XCOMM check for existence of /etc/inetd.conf
-XCOMM
-
-    if [ ! -f $FILE ]	# highly unlikely (in the 1990s, quite likely in 2018)
-    then
-	return
-    fi
-
-XCOMM
-XCOMM see if it already exists
-XCOMM
-
-    awk -v ttdb=$TTDBSERVERD \
-	'{if ($1 == "100083/1" && $6 != ttdb)
-		print "#cde " $0;
-	  else
-		print $0
-	 }' $FILE >$TMPFILE
-
-    cp $TMPFILE $FILE
-    rm $TMPFILE
-
-    awk '{if ($1 == "100083/1")
-		print $0 > "/tmp/tt-already-there"
-	 }' $FILE >/dev/null
-
-    if [ ! -f /tmp/tt-already-there ]
-    then
-        echo "100083/1 stream rpc/tcp wait root $TTDBSERVERD $TTDBSERVERD" \
-		 >>$FILE
-    else
-	rm /tmp/tt-already-there
-    fi
-}
-
-UnfixInetdDotConf()
-{
-FILE=/etc/inetd.conf
-TMPFILE=/tmp/inetd.conf
-TTDBSERVERD=CDE_INSTALLATION_TOP/bin/rpc.ttdbserver
-
-    if [ ! -f $FILE ]	# highly unlikely (in the 1990s, quite likely in 2018)
-    then
-	return
-    fi
-
-    awk -v ttdb=$TTDBSERVERD \
-	'{if ($1 == "100083/1" && $6 == ttdb)
-		;
-	  else
-		print $0
-	 }' $FILE >$TMPFILE
-
-    cp $TMPFILE $FILE
-    rm $TMPFILE
-
-    awk '{if ($1 == "#cde" && ($2 == "100083/1" || $2 == "100083")) {
-		$1 = $2;
-		$2 = ""
-	     }
-	     print $0
-	 }' $FILE >$TMPFILE
-
-    cp $TMPFILE $FILE
-    rm $TMPFILE
-}
-
 RemoveTTFiles()
 {
     while read SRC
@@ -143,13 +69,11 @@ XCOMM ######################################################################
   if [ "$OPERATION" = "configure" ]
   then
 
-    FixInetdDotConf
+  return 0
 
   elif [ "$OPERATION" = "deconfigure" ]
   then
 
-    UnfixInetdDotConf
-
     RemoveTTFiles
 
     VerifyInstalledFiles
@@ -161,20 +85,4 @@ XCOMM ######################################################################
 
   fi
 
-  if [ "$OPERATION" != "verify" ]
-  then
-
-    HASH issue a SIGHUP to the inetd process
-
-    ps -ef | grep inetd | grep -v grep >/tmp/tmppsout
-    if [ -s /tmp/tmppsout ]
-    then
-	awk '{print "kill -1 " $2}' /tmp/tmppsout | /bin/sh
-    else
-	[ -x /usr/sbin/inetd ] && /usr/sbin/inetd
-    fi
-
-    rm /tmp/tmppsout
-  fi
-
   return $retval