[pkg-firebird-general] todo#7

[Tamas TEVESZ]

another stab, try matching comments with reality.


Index: debian/functions.sh
===================================================================
--- debian/functions.sh	(revision 1018)
+++ debian/functions.sh	(working copy)
@@ -270,7 +270,7 @@
     then
         if [ -z "${ISC_PASSWORD:-}" ];
         then
-            NewPassword=`cut -c 1-8 < /proc/sys/kernel/random/uuid`
+            NewPassword=`cut -c 1-8 /proc/sys/kernel/random/uuid`
         else
             NewPassword=$ISC_PASSWORD
         fi
@@ -285,11 +285,11 @@
 }
 
 #---------------------------------------------------------------------------
-# updateHostsDotEquivFile
-# The /etc/hosts.equiv file is needed to allow local access for super server
-# from processes on the machine to port 3050 on the local machine.
-# The two host names that are needed there are localhost.localdomain 
-# and whatever hostname returns.
+# updateHostsDotEquiv
+# The /etc/gds_hosts.equiv file is needed to allow local access to super
+# server from processes on the local machine.
+# Only `localhost' is stricly needed; add `localhost.localdomain' if it was
+# present in /etc/hosts.equiv during an upgrade.
 
 updateHostsDotEquiv()
 {
@@ -301,10 +301,11 @@
         chmod u=rw,go=r $hostsEquiv
     fi
 
-    for l in localhost localhost.localdomain ;
-    do
-        grep "^$l\$" $hostsEquiv > /dev/null || echo $l >> $hostsEquiv
-    done
+    echo 'localhost' > $hostsEquiv
+
+    if grep -E '^[^#]*localhost\.localdomain[[:space:]]*$' /etc/hosts.equiv ; then
+	echo 'localhost.localdomain' >> $hostsEquiv
+    fi
 }
 
 
 
 

-- 
[-]

mkdir /nonexistent