Changeset 396 for trunk

Timestamp:

Mar 27, 2012, 9:03:01 PM (13 years ago)

Author:

katerina

Message:

Fix for ticket #294 (minor issues with stealth mode).

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• src/samhain_stealth.c (modified) (1 diff)
• src/yulectl.c (modified) (13 diffs)

trunk/docs/Changelog

@@ -1 +1 @@
 3.0.3:
+        * fixed problem with samhain_stealth.c (handle input config
+          files that don't end with a newline)
+        * fixed compiler warnings for yulectl.c with stealth
         * fixed lacking support for O_NOATIME on 64bit linux
 

trunk/src/samhain_stealth.c

@@ -414 +414 @@
        */
       lseek(fd, off_data, SEEK_SET);
-      add_off = hidein_hex_block(fd, _("[EOF]\n"), 6);
+      add_off = hidein_hex_block(fd, _("\n[EOF]\n"), 7);
       if (add_off == -1)
         {

trunk/src/yulectl.c

@@ -268 +268 @@
           {
             if (verbose && (num == 0))
-              fprintf (stdout, _("# There are no pending commands.\n"));
+              fprintf (stdout, "%s", _("# There are no pending commands.\n"));
             return 0;
           }
@@ -300 +300 @@
   if (0 != good)
     {
-      fprintf (stderr, _("ERROR: Bounced message != original message (possible reason: superfluous password).\n"));
+      fprintf (stderr, "%s", _("ERROR: Bounced message != original message (possible reason: superfluous password).\n"));
       return -1;
     }
@@ -306 +306 @@
     {
       if (verbose)
-        fprintf (stdout, _("# Message received by server.\n"));
+        fprintf (stdout, "%s", _("# Message received by server.\n"));
     }
 
@@ -317 +317 @@
          name);
 
-  printf(_("Purpose : send commands to the server via a socket,\n"));
-  printf(_("          in particular commands that the server would\n"));
-  printf(_("          transfer to the client <client_hostname> when\n"));
-  printf(_("          this client connects to deliver a message.\n\n"));
-  printf(_("          If password is required, it is read from\n"));
-  printf(_("          $HOME/.yulectl_cred or taken from the environment\n"));
-  printf(_("          variable YULECTL_PASSWORD (not recommended).\n\n"));
-
-  printf(_("Commands: RELOAD    <reload configuration>\n"));
-  printf(_("          STOP      <terminate>\n"));
-  printf(_("          SCAN      <initiate file system check\n"));
-  printf(_("          CANCEL    <cancel previous command>\n"));
-  printf(_("          LIST      <list queued commands>\n"));
-  printf(_("          LISTALL   <list queued and last sent commands>\n"));
-  printf(_("          PROBE     <probe all clients for necessity of reload>\n"));
+  printf("%s", _("Purpose : send commands to the server via a socket,\n"));
+  printf("%s", _("          in particular commands that the server would\n"));
+  printf("%s", _("          transfer to the client <client_hostname> when\n"));
+  printf("%s", _("          this client connects to deliver a message.\n\n"));
+  printf("%s", _("          If password is required, it is read from\n"));
+  printf("%s", _("          $HOME/.yulectl_cred or taken from the environment\n"));
+  printf("%s", _("          variable YULECTL_PASSWORD (not recommended).\n\n"));
+
+  printf("%s", _("Commands: RELOAD    <reload configuration>\n"));
+  printf("%s", _("          STOP      <terminate>\n"));
+  printf("%s", _("          SCAN      <initiate file system check\n"));
+  printf("%s", _("          CANCEL    <cancel previous command>\n"));
+  printf("%s", _("          LIST      <list queued commands>\n"));
+  printf("%s", _("          LISTALL   <list queued and last sent commands>\n"));
+  printf("%s", _("          PROBE     <probe all clients for necessity of reload>\n"));
   return;
 }
@@ -396 +396 @@
   if ( (strlen(home) + strlen(_("/.yulectl_cred")) + 1) > 4096)
     {
-      fprintf (stderr, _("ERROR: path for $HOME is too long.\n"));
+      fprintf (stderr, "%s", _("ERROR: path for $HOME is too long.\n"));
       exit(EXIT_FAILURE);
     }
@@ -424 +424 @@
   if (NULL == fgets(message2, sizeof(message2), fp))
     {
-      fprintf (stderr, 
+      fprintf (stderr,
                _("ERROR: empty or unreadable password file (%s).\n"),
                home);
@@ -434 +434 @@
   if (strlen(message2) > 14)
     {
-      fprintf (stderr, 
+      fprintf (stderr, "%s", 
                _("ERROR: Password too long (max. 14 characters).\n"));
       exit(EXIT_FAILURE);
@@ -501 +501 @@
             if (argv[num] == NULL || argv[num][0] == '\0') {
               usage(argv[0]);
-              fprintf(stderr, _("ERROR: -s: argument missing\n"));
+              fprintf(stderr, "%s", _("ERROR: -s: argument missing\n"));
               return (EXIT_FAILURE);
             } else {
@@ -518 +518 @@
             if (argv[num] == NULL || argv[num][0] == '\0') {
               usage(argv[0]);
-              fprintf(stderr, _("ERROR: -c: argument missing\n"));
+              fprintf(stderr, "%s", _("ERROR: -c: argument missing\n"));
               return (EXIT_FAILURE);
             } else {
@@ -575 +575 @@
       else
         {
-          fprintf(stderr, _("ERROR: this command requires a hostname\n"));
+          fprintf(stderr, "%s", _("ERROR: this command requires a hostname\n"));
           usage(argv[0]);
           return (EXIT_FAILURE);
@@ -623 +623 @@
   if (status < 0)
     {
-      fprintf(stderr, _("ERROR: sending command to server failed\n"));
+      fprintf(stderr, "%s", _("ERROR: sending command to server failed\n"));
       (void) termination_handler(0);
       return (EXIT_FAILURE);
@@ -634 +634 @@
     {
       if (verbose)
-        fprintf(stdout, _("# Waiting for listing.\n"));
+        fprintf(stdout, "%s", _("# Waiting for listing.\n"));
     }
   else
     {
       if (verbose)
-        fprintf(stdout, _("# Waiting for confirmation.\n"));
+        fprintf(stdout, "%s", _("# Waiting for confirmation.\n"));
     }
   status = recv_from_server (message);
@@ -645 +645 @@
   if (status < 0)
     {
-      fprintf(stderr, _("ERROR: receiving data from server failed.\n"));
+      fprintf(stderr, "%s", _("ERROR: receiving data from server failed.\n"));
       (void) termination_handler(0);
       return (EXIT_FAILURE);