Changeset 194 for trunk

Timestamp:

Nov 14, 2008, 8:17:59 PM (16 years ago)

Author:

katerina

Message:

Fix for config reload issue with stealth mode (ticket #109).

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• src/sh_readconf.c (modified) (1 diff)
• src/sh_unix.c (modified) (1 diff)

trunk/docs/Changelog

@@ -1 +1 @@
 2.5.1:
+        * fix for config reload issue with stealth mode (reported by
+          siim)
         * add -fstack-protector flags to LDFLAGS
         * cygwin fix: don't use dnmalloc, doesn't work with pthreads

trunk/src/sh_readconf.c

@@ -261 +261 @@
      */
   fdTmp = open_tmp(); 
+
+  sh_unix_getline_stealth (0, NULL, 0); /* initialize */
+
   while ( sh_unix_getline_stealth (fd, line_in, 512) > 0) {
     hidden_count++;

trunk/src/sh_unix.c

@@ -4676 +4676 @@
   SL_ENTER(_("sh_unix_getline_stealth"));
 
+  if (str == NULL)
+    {
+      off_data   = 0;
+      max_data   = 0;
+      bytes_read = 0;
+      stealth_init = BAD;
+      SL_RETURN(0, _("sh_unix_getline_stealth"));
+    }
 
   /* --- Initialize. ---