Changeset 210 for trunk

Timestamp:

Jan 29, 2009, 7:54:16 PM (16 years ago)

Author:

katerina

Message:

Fix for ticket #136 (compile error); also enhance testsuite to catch compiler warnings.

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• docs/Changelog (modified) (1 diff)
• src/sh_err_log.c (modified) (2 diffs)
• src/sh_forward.c (modified) (1 diff)
• src/sh_getopt.c (modified) (13 diffs)
• src/sh_hash.c (modified) (7 diffs)
• src/sh_mail.c (modified) (4 diffs)
• src/sh_portcheck.c (modified) (3 diffs)
• src/sh_processcheck.c (modified) (1 diff)
• src/sh_utils.c (modified) (7 diffs)
• test/testcompile.sh (modified) (4 diffs)

trunk/configure.ac

@@ -12 +12 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 2.5.2a)
+AM_INIT_AUTOMAKE(samhain, 2.5.2b)
 AC_DEFINE([SAMHAIN], 1, [Application is samhain])
 AC_CANONICAL_HOST

trunk/docs/Changelog

@@ +1 @@
+2.5.2b (29-01-2009):
+        * turn warnings into errors in the compile test suite
+        * fix missing define in sh_portcheck.c to eliminate compiler warning
+          (reported by joerg)
+
 2.5.2a (26-01-2009):
         * fix problem building deb package (bit rot; reported by joerg)

trunk/src/sh_err_log.c

@@ -380 +380 @@
                 { 
                   if (key[0] != '\n' && key[0] != '\0')
-                    fprintf(stdout, _("New audit trail, enter key: "));
+                    fprintf(stdout, "%s",_("New audit trail, enter key: "));
                   else if (key[0] == '\n')
                     {
@@ -418 +418 @@
                 {
                   chk_mode = CHK_KEY;
-                  fprintf(stdout, _("Key not found in file\n"));
+                  fprintf(stdout, "%s",_("Key not found in file\n"));
                   goto findKey;
                 }

trunk/src/sh_forward.c

@@ -1883 +1883 @@
         _exit(EXIT_SUCCESS);
       }
-    fprintf(stdout, _("ERROR initializing BigNum library.\n"));
+    fprintf(stdout, "%s",_("ERROR initializing BigNum library.\n"));
     fflush (stdout);
     _exit(EXIT_FAILURE);

trunk/src/sh_getopt.c

@@ -321 +321 @@
 #ifndef DEFAULT_CONSOLE
   if (num > 0) fputc ('\n', stdout);
-  printf (_(" console (/dev/console)")); ++num;
+  printf ("%s", _(" console (/dev/console)")); ++num;
 #else
   if (num > 0) fputc ('\n', stdout);
   if (0 == strcmp (DEFAULT_CONSOLE, _("NULL")))
-    { printf (_("console (/dev/console)"));  ++num; }
+    { printf ("%s", _("console (/dev/console)"));  ++num; }
   else
     { printf (_("console (%s)"), DEFAULT_CONSOLE);  ++num; }
@@ -406 +406 @@
 #if defined(USE_SYSTEM_MALLOC)
   if (num > 0) fputc ('\n', stdout);
-  printf (_(" using system malloc")); ++num;
+  fputs (_(" using system malloc"), stdout); ++num;
 #else
   if (num > 0) fputc ('\n', stdout);
-  printf (_(" using dnmalloc")); ++num;
+  fputs (_(" using dnmalloc"), stdout); ++num;
 #endif
 
@@ -554 +554 @@
              "(c) 1999-2008 Rainer Wichmann (http://la-samhna.de).\n"),
            VERSION);
-  fprintf (stdout, _("This software comes with ABSOLUTELY NO WARRANTY. "));
-  fprintf (stdout, _("Use at own risk.\n\n"));
+  fprintf (stdout, "%s",_("This software comes with ABSOLUTELY NO WARRANTY. "));
+  fprintf (stdout, "%s",_("Use at own risk.\n\n"));
 
   sh_getopt_print_log_facilities ();
@@ -567 +567 @@
 static int sh_getopt_copyright (const char * dummy)
 {
-  fprintf (stdout, 
+  fprintf (stdout, "%s",
            _("Copyright (C) 1999-2008 Rainer Wichmann"\
              " (http://la-samhna.de).\n\n"));
 
-  fprintf (stdout, 
+  fprintf (stdout, "%s",
            _("This program is free software; "\
              "you can redistribute it and/or modify\n"));
-  fprintf (stdout, _("it under the terms of the GNU General "\
+  fprintf (stdout, "%s",_("it under the terms of the GNU General "\
                      "Public License as published by\n"));
-  fprintf (stdout, _("the Free Software Foundation; either version 2 "\
+  fprintf (stdout, "%s",_("the Free Software Foundation; either version 2 "\
                      "of the License, or\n"));
-  fprintf (stdout, _("(at your option) any later version.\n\n"));
-
-  fprintf (stdout, _("This program is distributed in the hope "\
+  fprintf (stdout, "%s",_("(at your option) any later version.\n\n"));
+
+  fprintf (stdout, "%s",_("This program is distributed in the hope "\
                      "that it will be useful,\n"));
-  fprintf (stdout, _("but WITHOUT ANY WARRANTY; "\
+  fprintf (stdout, "%s",_("but WITHOUT ANY WARRANTY; "\
                      "without even the implied warranty of\n"));
-  fprintf (stdout, _("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."\
-                     " See the\n"));
-  fprintf (stdout, _("GNU General Public License for more details.\n\n"));
-
-  fprintf (stdout, _("You should have received a copy of the "\
+  fprintf (stdout, "%s",_("MERCHANTABILITY or FITNESS FOR A PARTICULAR "\
+                     "PURPOSE. See the\n"));
+  fprintf (stdout, "%s",_("GNU General Public License for more details.\n\n"));
+
+  fprintf (stdout, "%s",_("You should have received a copy of the "\
                      "GNU General Public License\n"));
-  fprintf (stdout, _("along with this program; "\
+  fprintf (stdout, "%s",_("along with this program; "\
                      "if not, write to the Free Software\n"));
-  fprintf (stdout, _("Foundation, Inc., 59 Temple Place - Suite 330, "\
+  fprintf (stdout, "%s",_("Foundation, Inc., 59 Temple Place - Suite 330, "\
                      "Boston, MA  02111-1307, USA.\n\n"));
 
-  fprintf (stdout, _("This product makes use of the reference implementation "\
-                     "of the TIGER message\n"));
-  fprintf (stdout, _("digest algorithm. This code is copyright Eli Biham "\
+  fprintf (stdout, "%s",_("This product makes use of the reference "\
+                     "implementation of the TIGER message\n"));
+  fprintf (stdout, "%s",_("digest algorithm. This code is copyright Eli Biham "\
                      "(biham@cs.technion.ac.il)\n"));
-  fprintf (stdout, _("and Ross Anderson (rja14@cl.cam.ac.uk). It can be used "\
+  fprintf (stdout, "%s",_("and Ross Anderson (rja14@cl.cam.ac.uk). It can be used "\
                      "freely without any\n"));
-  fprintf (stdout, _("restrictions.\n"));
+  fprintf (stdout, "%s",_("restrictions.\n"));
 #if defined(USE_SRP_PROTOCOL) && !defined(SH_STANDALONE)
 #if (!defined(HAVE_LIBGMP) || !defined(HAVE_GMP_H))
-  fprintf (stdout, _("This product makes use of the 'bignum' library by "\
+  fprintf (stdout, "%s",_("This product makes use of the 'bignum' library by "\
                      "Henrik Johansson\n"));
-  fprintf (stdout, _("(Henrik.Johansson@Nexus.Comm.SE). If you are including "\
-                     "this library in a\n"));
-  fprintf (stdout, _("commercial product, be sure to distribute ALL of"\
+  fprintf (stdout, "%s",_("(Henrik.Johansson@Nexus.Comm.SE). If you are "\
+                     "including this library in a\n"));
+  fprintf (stdout, "%s",_("commercial product, be sure to distribute ALL of"\
                      " it with the product.\n"));
 #endif
-  fprintf (stdout, _("This product uses the 'Secure Remote Password' "\
+  fprintf (stdout, "%s",_("This product uses the 'Secure Remote Password' "\
                      "cryptographic\n"));
-  fprintf (stdout, _("authentication system developed by Tom Wu "\
+  fprintf (stdout, "%s",_("authentication system developed by Tom Wu "\
                      "(tjw@CS.Stanford.EDU).\n"));
 #endif
-  fprintf (stdout, _("\nPlease refer to the file COPYING in the source "\
+  fprintf (stdout, "%s",_("\nPlease refer to the file COPYING in the source "\
                      "distribution for a"));
-  fprintf (stdout, _("\nfull list of incorporated code and associated "\
+  fprintf (stdout, "%s",_("\nfull list of incorporated code and associated "\
                      "licenses.\n"));
 
@@ -644 +644 @@
              "(c) 1999-2006 Rainer Wichmann (http://la-samhna.de).\n"),
            VERSION);
-  fprintf (stdout, _("This software comes with ABSOLUTELY NO WARRANTY. "));
-  fprintf (stdout, _("Use at own risk.\n"));
-
-  fprintf (stdout, _("Usage:\n\n"));
+  fprintf (stdout, "%s",_("This software comes with ABSOLUTELY NO WARRANTY. "));
+  fprintf (stdout, "%s",_("Use at own risk.\n"));
+
+  fprintf (stdout, "%s",_("Usage:\n\n"));
 
   for (i = 0; op_table[i].longopt != NULL; ++i) {
@@ -656 +656 @@
     if (op_table[i].shortopt != '-' && 
         strchr(opts, op_table[i].shortopt) != NULL)
-      fprintf (stdout, _("Short option char collision !\n"));
+      fprintf (stdout, "%s",_("Short option char collision !\n"));
     opts[i] = op_table[i].shortopt;
 
@@ -689 +689 @@
   }
 
-  fprintf (stdout, 
+  fprintf (stdout, "%s",
            _("\nPlease report bugs to support@la-samhna.de.\n"));
 
@@ -767 +767 @@
                               /* not last option
                                */
-                              fprintf (stderr, 
+                              fprintf (stderr, "%s",
                                        _("Error: short option with argument is not last in option string\n"));
                               (void) sh_getopt_usage(_("fail"));
@@ -775 +775 @@
                               /* argument required, but no avail 
                                */
-                              fprintf (stderr, _("Error: missing argument\n"));
+                              fprintf (stderr, "%s",
+                                       _("Error: missing argument\n"));
                               (void) sh_getopt_usage(_("fail"));
                             } 
@@ -813 +814 @@
             {
               /* unrecognized short option */
-              fprintf (stderr, _("Error: unrecognized short option\n"));
+              fprintf (stderr, "%s",_("Error: unrecognized short option\n"));
               (void) sh_getopt_usage(_("fail"));
             }
@@ -840 +841 @@
                               /* argument required, but no avail 
                                */
-                              fprintf (stderr, _("Error: missing argument\n"));
+                              fprintf (stderr, "%s",
+                                       _("Error: missing argument\n"));
                               (void) sh_getopt_usage(_("fail"));
                             } 
@@ -870 +872 @@
                           else 
                             {
-                              fprintf (stderr, _("Error: invalid argument\n"));
+                              fprintf (stderr, "%s",
+                                       _("Error: invalid argument\n"));
                               /* argument required, but no avail */
                               (void) sh_getopt_usage(_("fail"));
@@ -899 +902 @@
             {
               /* unrecognized long option */
-              fprintf (stderr, _("Error: unrecognized long option\n"));
+              fprintf (stderr, "%s",_("Error: unrecognized long option\n"));
               (void) sh_getopt_usage(_("fail"));
             }

trunk/src/sh_hash.c

@@ -1778 +1778 @@
                   sl_write (pushdata_fd,        "\n", 1);
                 } else {
-                  printf (_("\n#Host "));
+                  printf ("%s",_("\n#Host "));
                   printf ("%s", sh.host.name);
-                  printf (_(" Version "));
+                  printf ("%s",_(" Version "));
                   printf ("%s", sh_db_version_string);
-                  printf (_(" Date "));
+                  printf ("%s",_(" Date "));
                   (void) sh_unix_time(0, timestring, sizeof(timestring));
                   printf ("%s\n", timestring);
@@ -3868 +3868 @@
     {
       if (ListWithDelimiter == S_TRUE)
-        printf(_(" no_attr"));
+        printf("%s",_(" no_attr"));
     }
   putchar('\n');
@@ -3961 +3961 @@
         res = uncompress(decompressed, &clen, decoded, dlen);
         if (res == Z_MEM_ERROR)
-          { fprintf(stderr, _("Error: Not enough memory\n")); return -1; }
+          { fprintf(stderr, "%s",_("Error: Not enough memory\n")); return -1; }
         if (res == Z_DATA_ERROR)
-          { fprintf(stderr, _("Error: Data corrupt or incomplete\n")); return -1; }
+          { fprintf(stderr, "%s",_("Error: Data corrupt or incomplete\n")); return -1; }
       } while (res == Z_BUF_ERROR || clen == clen_o);
 
@@ -3973 +3973 @@
   (void) linkpath;
 #endif
-  fprintf(stderr, _("Error: No data available\n")); 
+  fprintf(stderr, "%s",_("Error: No data available\n")); 
   return -1;
 }
@@ -3991 +3991 @@
   if (sl_is_suid())
     {
-      fprintf(stderr, _("ERROR: insufficient privilege\n"));
+      fprintf(stderr, "%s",_("ERROR: insufficient privilege\n"));
       _exit (EXIT_FAILURE);
       return -1; /* for Mac OSX compiler */
@@ -4047 +4047 @@
               else
                 {
-                  fprintf(stderr, _("File is a link\n"));
+                  fprintf(stderr, "%s",_("File is a link\n"));
                   _exit(EXIT_FAILURE);
                   return -1;
@@ -4068 +4068 @@
   if (flag == 0)
     {
-      fprintf(stderr, _("File not found\n"));
+      fprintf(stderr, "%s",_("File not found\n"));
       _exit(EXIT_FAILURE);
     }

trunk/src/sh_mail.c

@@ -197 +197 @@
           if (numsig > 0)
             {
-              fprintf (stderr, _("ERROR (no key -- cannot check)\n"));
+              fprintf (stderr, "%s",_("ERROR (no key -- cannot check)\n"));
               continue;
             }
@@ -211 +211 @@
       else if (numsig == 0)
         {
-          fprintf (stderr, _("ERROR (repeated audit trail)\n"));
+          fprintf (stderr, "%s",_("ERROR (repeated audit trail)\n"));
           continue;
         }
@@ -220 +220 @@
           sh_util_encode(key, bufc, 1, 'A');
           (void) sl_strlcpy (mail_trail_ptr->trail_key, key, KEY_LEN+1);
-          fprintf (stderr, _("(unchecked)\n"));
+          fprintf (stderr, "%s",_("(unchecked)\n"));
         }
       else
@@ -244 +244 @@
                           KEY_LEN) != 0) 
             {
-              fprintf (stderr, _("(FAILED)\n"));
+              fprintf (stderr, "%s",_("(FAILED)\n"));
             } 
           else 
             { 
-              fprintf (stderr, _("(passed)\n"));
+              fprintf (stderr, "%s",_("(passed)\n"));
             }
 

trunk/src/sh_portcheck.c

@@ -129 +129 @@
 #include "sh_utils.h"
 #include "sh_modules.h"
+#define SH_NEED_GETHOSTBYXXX
 #include "sh_static.h"
 #include "sh_pthread.h"
@@ -655 +656 @@
   else
     {
-      snprintf (buf, sizeof(buf), _("unknown"));
+      snprintf (buf, sizeof(buf), "%s",_("unknown"));
     }
   return buf;
@@ -975 +976 @@
 int sh_portchk_init (struct mod_type * arg)
 {
+#ifndef HAVE_PTHREAD
+  (void) arg;
+#endif
+
   if (sh_portchk_active == S_FALSE)
     return SH_MOD_FAILED;

trunk/src/sh_processcheck.c

@@ -1314 +1314 @@
 int sh_prochk_init (struct mod_type * arg)
 {
+#ifndef HAVE_PTHREAD
+  (void) arg;
+#endif
+
   if (ShProchkActive == S_FALSE)
     return SH_MOD_FAILED;

trunk/src/sh_utils.c

@@ -181 +181 @@
           else
             {
-              fprintf(stderr, _("Please answer y(es) or n(o)\n"));
+              fprintf(stderr, "%s", _("Please answer y(es) or n(o)\n"));
             }
           /*@-charintliteral@*/
@@ -1123 +1123 @@
   if (0 != sl_is_suid())
     {
-      fprintf(stderr, _("ERROR: insufficient privilege\n"));
+      fprintf(stderr, "%s", _("ERROR: insufficient privilege\n"));
       _exit (EXIT_FAILURE);
       /*@notreached@*/
@@ -1131 +1131 @@
   if (new_in == NULL || new_in[0] == '\0')
     {
-      fprintf(stderr, 
+      fprintf(stderr, "%s", 
               _("ERROR: no key given\n Argument must be 'key@path'\n"));
       _exit (EXIT_FAILURE);
@@ -1153 +1153 @@
   if (j == 0)
     {
-      fprintf(stderr, 
+      fprintf(stderr, "%s",
               _("ERROR: no path to executable given\n Argument must be 'key@path'\n"));
       free(new);
@@ -1221 +1221 @@
           UINT32 kbuf[KEY_BYT/sizeof(UINT32)];
 
-          printf(_("old key found\n")); 
+          printf("%s", _("old key found\n")); 
           h1 = sh_tiger_hash_uint32 (key, TIGER_DATA, 
                                      (unsigned long)strlen(key),
@@ -1237 +1237 @@
     }
 
-  fprintf(stderr, 
+  fprintf(stderr, "%s",
           _("ERROR: old key not found\n"));
   free(new); free (outpath); free(image);
@@ -1246 +1246 @@
 
  bail_mem:
-  fprintf(stderr, 
+  fprintf(stderr, "%s",
           _("ERROR: out of memory\n"));
   if (new) free(new); 

trunk/test/testcompile.sh

@@ -20 +20 @@
 #
 
-# dnmalloc + flawfinder + (35 * 3)
-MAXTEST=107; export MAXTEST
+# dnmalloc + flawfinder + (36 * 3)
+MAXTEST=110; export MAXTEST
 
 run_dnmalloc ()
@@ -202 +202 @@
 {
         fail=0
+        #
+        # Compiler warnings can be OS specific, but at least
+        # on Linux there should be none
+        #
+        isLinux=0
+        uname -a | grep Linux >/dev/null
+        if [ $? -eq 0 ]; then
+            isLinux=1
+            sed --in-place 's/-Wall/-Wall -Werror/' Makefile
+        fi
+        #
         if test x$1 = x0; then
                 [ -z "$verbose" ]     ||  log_msg_ok  "configure...  $TEST";
@@ -219 +230 @@
                 fail=1
         fi
+        if [ $isLinux -eq 1 ]; then
+            sed --in-place 's/-Wall -Werror/-Wall/' Makefile
+        fi
         if [ $fail -eq 1 ]; then
             [ -z "$quiet" ] && log_fail $2 ${MAXTEST} "$TEST";
@@ -335 +349 @@
         # test standalone compilation
         #
+        TEST="${S}standalone w/procchk w/portchk w/static${E}"
+        #
+        if test -r "Makefile"; then
+                $MAKE distclean 
+        fi
+        #
+        ${TOP_SRCDIR}/configure --quiet  --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$PW_DIR/samhainrc.test  --enable-process-check --enable-port-check --enable-static > /dev/null 2>> test_log
+        #
+        let "num = num + 1" >/dev/null
+        testmake $? $num || let "numfail = numfail + 1"  >/dev/null
+        let "num = num + 1" >/dev/null
+        run_smatch $? $num || let "numfail = numfail + 1"  >/dev/null
+        let "num = num + 1" >/dev/null
+        run_uno $? $num || let "numfail = numfail + 1"  >/dev/null
+
+        #
+        # test standalone compilation
+        #
         TEST="${S}standalone w/procchk w/portchk w/stealth${E}"
         #