Changeset 486 for trunk

Timestamp:

Sep 1, 2015, 8:28:42 PM (9 years ago)

Author:

katerina

Message:

Fix for ticket #384 (use logger utility in posix compliant way).

Location:

trunk

Files:

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

trunk/docs/Changelog

@@ -1 +1 @@
 4.1.0:
+        * fix safe_logger() - uses the logger utility with a non-posix option 
         * fix missing reporting on shell expansion capability in --version
         * fix missing error message on invalid list for skipchecksum

trunk/src/sh_unix.c

@@ -369 +369 @@
   
   char l0[64], l1[64], l2[64], l3[64];
-  char a0[32], a1[32], a2[32];
+  char a0[32];
   char e0[128];
   char msg[128];
@@ -375 +375 @@
   char * locations[] = { NULL, NULL, NULL, NULL, NULL };
   char * envp[]      = { NULL, NULL };
-  char * argp[]      = { NULL, NULL, NULL, NULL, NULL };
+  char * argp[]      = { NULL, NULL, NULL };
   
   pid_t  thepid = getpid();
@@ -390 +390 @@
   
   envp[0] = e0;
-  
   argp[0] = a0;
-  argp[1] = a1;
-  argp[2] = a2;
   
   sl_strlcpy(msg, _("samhain["), 128);
@@ -436 +433 @@
 
   sl_strlcpy (a0, _("logger"), 32);
-  sl_strlcpy (a1, _("-p"), 32);
-  sl_strlcpy (a2, _("daemon.alert"), 32);
-
   sl_strlcpy (e0,
               _("PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/ucb:/usr/local/bin"),
@@ -451 +445 @@
 
   if (locations[i] != NULL) {
-    argp[3] = msg;
+    argp[1] = msg;
     newpid = fork();
     if (newpid == 0) {