[csw-devel] SF.net SVN: gar:[10200] csw/mgar/pkg/cswclassutils/trunk

[bdwalton at users.sourceforge.net]

Revision: 10200
          http://gar.svn.sourceforge.net/gar/?rev=10200&view=rev
Author:   bdwalton
Date:     2010-06-12 00:29:16 +0000 (Sat, 12 Jun 2010)

Log Message:
-----------
cswclassutils: bug fix for i.cswinetd; was triggering on multiple lines

Modified Paths:
--------------
    csw/mgar/pkg/cswclassutils/trunk/checksums
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd

Modified: csw/mgar/pkg/cswclassutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/checksums	2010-06-11 16:25:18 UTC (rev 10199)
+++ csw/mgar/pkg/cswclassutils/trunk/checksums	2010-06-12 00:29:16 UTC (rev 10200)
@@ -1,8 +1,8 @@
 48a97af56d55bc90ce90303228ed8cc3  COPYING
 9846081f8109dc9149dc026b89fbf137  CSWcswclassutils.i.cswcpsampleconf
-25f1f5a680a6dc118d2c54333703974f  CSWcswclassutils.i.cswcrontab
+efd19a09c355319c7d649885e4f9f76e  CSWcswclassutils.i.cswcrontab
 5e2ae2c6bd828061f86d84f09087b06a  CSWcswclassutils.i.cswetcservices
-5617480b81dd62c8c99c817e252164cb  CSWcswclassutils.i.cswinetd
+e19dc831fd25be25706febc428607993  CSWcswclassutils.i.cswinetd
 6abb13158fee906870d1d68dc0fae6f3  CSWcswclassutils.i.cswinitsmf
 a667515489aafc81d41159765faf698f  CSWcswclassutils.i.cswmigrateconf
 8ab721535d43dcef702538d394e7a2ce  CSWcswclassutils.i.cswpostmsg
@@ -11,7 +11,7 @@
 4f816acb06e8f95add6faf8607859da2  CSWcswclassutils.i.cswtexinfo
 e906a50bc2d82e341f78d582f32ecb88  CSWcswclassutils.i.cswusergroup
 d278a28a6f901c4ff5f07c583b4cff3d  CSWcswclassutils.r.cswcpsampleconf
-b452d4e6b95df03b6b00c6e980bb1004  CSWcswclassutils.r.cswcrontab
+f988248725a4607110a13820a005b72f  CSWcswclassutils.r.cswcrontab
 d60261ddc46e2cc83ecbbfc586a7e686  CSWcswclassutils.r.cswetcservices
 9039ea60ad4c3f8994205fb242a49a72  CSWcswclassutils.r.cswinetd
 791db9c2f6685aca67043820d260fc60  CSWcswclassutils.r.cswinitsmf

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd	2010-06-11 16:25:18 UTC (rev 10199)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd	2010-06-12 00:29:16 UTC (rev 10200)
@@ -58,7 +58,7 @@
 
   # we won't register with inetd if the service name isn't registered
   # in the global services file.
-  exists=`awk "\\\$1 == \"$svcname\" {print \"found\" }" /etc/services`
+  exists=`awk "\\\$1 == \"$svcname\" && \\\$2 ~ /$proto/ {print \"found\"; exit }" /etc/services`
   if [ "$exists" = "found" ]; then
       if [ -n "$DEBUG" ]; then
 	  echo "Installing inetd service:"
@@ -115,7 +115,7 @@
 	  echo "Inetd service '$svcname' should be disabled by default."
       fi
   else
-      echo "Service '$svcname' not found in /etc/inet/services.  Won't setup inetd for it."
+      echo "Service '$svcname' not found in /etc/services.  Won't setup inetd for it."
       exit 2
   fi
 done


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.