Changeset 65 for trunk

Timestamp:

Oct 29, 2006, 11:33:21 PM (18 years ago)

Author:

rainer

Message:

Fix some minor bugs.

Location:

trunk

Files:

• Makefile.in (modified) (2 diffs)
• docs/Changelog (modified) (1 diff)
• dsys/comINSTALL (modified) (2 diffs)
• rules.deb.in (modified) (2 diffs)
• src/sh_error.c (modified) (2 diffs)
• src/sh_unix.c (modified) (1 diff)

trunk/Makefile.in

@@ -819 +819 @@
 
 deb-run:
-        @maintainer=`gpg --list-secret-keys | grep 'sec ' | cut -d" " -f 5-`;\
+        @maintainer=`gpg --list-secret-keys | grep 'sec ' | cut -d" " -f 5- | sed 's/^ *//' | sed q1`;\
         if test "x$$maintainer" = x; then \
                 maintainer="Nobody Nowhere <nobody@example.com>"; \
@@ -851 +851 @@
         echo $(sysconfdir)/@install_name@rc > debian/conffiles; \
         echo /etc/init.d/@install_name@ >> debian/conffiles; \
-        cp init/samhain.startLinux debian/@install_name@.init; \
+        if test -f /usr/lib/lsb/install_initd; then \
+          cp init/samhain.startLSB debian/@install_name@.init; \
+        else \
+          cp init/samhain.startLinux debian/@install_name@.init; \
+        fi; \
         echo "Source: samhain"     > debian/control; \
         echo "Section: admin"     >> debian/control; \

trunk/docs/Changelog

@@ -1 @@
-2.2.5:
+2.2.6:
+        * fix error about non-readable file with no checksum required
+        * fix server warning about 'no server name known'
+        * fix 'make deb' makefile target
+        * fix default export severity for server
+        
+2.2.5 (05-10-2006):
         * fix broken Install.sh, reported by Alexander Kraemer
         * workaround for glob(3) sillyness on MacOS X (reported by David)

trunk/dsys/comINSTALL

@@ -329 +329 @@
         if test "x$mytest_file" = x; then
             rcfile_perm=640;
-            rcfile_owner=`ls -ld ${yule_data} | awk '{print $3 }'`
-            rcfile_group=`ls -ld ${yule_data} | awk '{print $4 }'`
+            xgid=`(cat /etc/group; ypcat group) 2>/dev/null |\
+              grep "^samhain:" | awk -F: '{ print $3; }'`
+            if test "x$xgid" = x; then
+              rcfile_owner=`ls -ld ${yule_data} | awk '{print $3 }'`
+              rcfile_group=`ls -ld ${yule_data} | awk '{print $4 }'`
+            else
+              rcfile_owner=`ls -ld ${yule_data} | awk '{print $3 }'`
+              rcfile_group=samhain
+            fi
         else
             mytest_file=`basename $mytest_file`
@@ -546 +553 @@
         if test "x$mytest_file" = x; then
             rcfile_perm=640;
-            rcfile_owner=`ls -ld ${yule_data} | awk '{print $3 }'`
-            rcfile_group=`ls -ld ${yule_data} | awk '{print $4 }'`
+            xgid=`(cat /etc/group; ypcat group) 2>/dev/null |\
+              grep "^samhain:" | awk -F: '{ print $3; }'`
+            if test "x$xgid" = x; then
+              rcfile_owner=`ls -ld ${yule_data} | awk '{print $3 }'`
+              rcfile_group=`ls -ld ${yule_data} | awk '{print $4 }'`
+            else
+              rcfile_owner=`ls -ld ${yule_data} | awk '{print $3 }'`
+              rcfile_group=samhain
+            fi
         else
             mytest_file=`basename $mytest_file`

trunk/rules.deb.in

@@ -70 +70 @@
         dh_installdebconf       
         dh_installdocs 
-        [ -f debian/tmp/usr/share/doc/@install_name@/MANUAL-2_0.html.tar ] && \
+        [ -f debian/tmp/usr/share/doc/@install_name@/MANUAL-2_2.html.tar ] && \
                 cd debian/tmp/usr/share/doc/@install_name@ && \
-                tar xf MANUAL-2_0.html.tar && mv MANUAL-2_0 manual.html && \
-                rm -f MANUAL-2_0.html.tar
+                tar xf MANUAL-2_2.html.tar && mv MANUAL-2_2 manual.html && \
+                rm -f MANUAL-2_2.html.tar
         dh_installexamples @top_srcdir@/scripts/example_pager.pl \
                 @top_srcdir@/scripts/example_sms.pl \
@@ -90 +90 @@
                     sed 's%/etc/init.d/@install_name@ start%:%' > postinst.tmp && \
                     mv postinst.tmp postinst.debhelper
+        [ -f debian/postinst.debhelper ] && \
+                cd debian && \
+                cat postinst.debhelper | \
+                    sed 's%invoke-rc.d @install_name@ start%:%' > postinst.tmp && \
+                    mv postinst.tmp postinst.debhelper
         [ -f debian/prerm.debhelper ] && \
                 cd debian && \
                 cat prerm.debhelper | \
                     sed 's%/etc/init.d/@install_name@ stop%/etc/init.d/@install_name@ stop || echo service @install_name@ already stopped%' > prerm.tmp && \
+                    mv prerm.tmp prerm.debhelper
+        [ -f debian/prerm.debhelper ] && \
+                cd debian && \
+                cat prerm.debhelper | \
+                    sed 's%invoke-rc.d @install_name@ stop%invoke-rc.d @install_name@ stop || echo service @install_name@ already stopped%' > prerm.tmp && \
                     mv prerm.tmp prerm.debhelper
         # dh_installmanpages

trunk/src/sh_error.c

@@ -1130 +1130 @@
             class != AUD                               )
 #ifdef SH_WITH_SERVER
-           || (flag_inet == S_TRUE) /* always log inet to export */
+           /* always log inet to export */
+           || (flag_inet == S_TRUE && sh.srvexport.name[0] != '\0') 
 #endif
           /* sh.flag.isserver != GOOD                    && */
@@ -1558 +1559 @@
   flag_err_info           = SL_TRUE;
 #endif
+
+#if defined(SH_WITH_SERVER)
+  errFlags.exportlevel    = SH_ERR_NOT;
+#else
   errFlags.exportlevel    = (SH_ERR_STAMP | SH_ERR_ERR    | SH_ERR_SEVERE |
                              SH_ERR_FATAL);
+#endif
 
   errFlags.log_class      = 0xFFFF;

trunk/src/sh_unix.c

@@ -3090 +3090 @@
                    KEY_LEN + 1);
 
-      tmp2 = sh_util_safe_name (theFile->fullpath);
-      sh_error_handle (level, FIL__, __LINE__, fstat_return, MSG_E_READ,
-                       tmp2);
-      SH_FREE(tmp2);
+      if ((theFile->check_mask & MODI_CHK) != 0)
+        {
+          tmp2 = sh_util_safe_name (theFile->fullpath);
+          sh_error_handle (level, FIL__, __LINE__, fstat_return, MSG_E_READ,
+                           tmp2);
+          SH_FREE(tmp2);
+        }
     }