Changes in trunk/src/sh_readconf.c [20:27]

File:

• trunk/src/sh_readconf.c (modified) (22 diffs)

trunk/src/sh_readconf.c

@@ -52 +52 @@
 #endif
 
-extern int set_reverse_lookup (char * c);
+extern int set_reverse_lookup (const char * c);
 
 #undef  FIL__
@@ -69 +69 @@
   SH_SECTION_USER0,
   SH_SECTION_USER1,
+  SH_SECTION_USER2,
+  SH_SECTION_USER3,
+  SH_SECTION_USER4,
   SH_SECTION_PRELINK,
 #if defined (SH_WITH_MAIL) 
@@ -108 +111 @@
   { N_("[User0]"),            SH_SECTION_USER0},
   { N_("[User1]"),            SH_SECTION_USER1},
+  { N_("[User2]"),            SH_SECTION_USER2},
+  { N_("[User3]"),            SH_SECTION_USER3},
+  { N_("[User4]"),            SH_SECTION_USER4},
   { N_("[Prelink]"),          SH_SECTION_PRELINK},
 #ifdef WITH_EXTERNAL
@@ -282 +288 @@
   /* The system type, release, and machine.
    */
-  sprintf(myident, _("%s:%s:%s"),                  /* known to fit  */
-          sh.host.system, sh.host.release, sh.host.machine);
+  sl_snprintf(myident, sizeof(myident), _("%s:%s:%s"),  
+              sh.host.system, /* flawfinder: ignore */ 
+              sh.host.release, sh.host.machine);
 
 
@@ -580 +587 @@
 }
 
-int sh_readconf_set_path (char * which, char * what)
+int sh_readconf_set_path (char * which, const char * what)
 {
   int len;
@@ -621 +628 @@
 }
 
-int sh_readconf_set_database_path (char * what)
+int sh_readconf_set_database_path (const char * what)
 {
   return (sh_readconf_set_path(sh.data.path, what));
 }
 
-int sh_readconf_set_logfile_path (char * what)
+int sh_readconf_set_logfile_path (const char * what)
 {
   return (sh_readconf_set_path(sh.srvlog.name, what));
 }
 
-int sh_readconf_set_lockfile_path (char * what)
+int sh_readconf_set_lockfile_path (const char * what)
 {
   return( sh_readconf_set_path(sh.srvlog.alt, what));
@@ -645 +652 @@
  
     
-int sh_readconf_setTime (char * str, ShTimerItem what)
+int sh_readconf_setTime (const char * str, ShTimerItem what)
 {
   unsigned long i = atoi (str);
@@ -674 +681 @@
 }
 
-int sh_readconf_setMailtime (char * c)
+int sh_readconf_setMailtime (const char * c)
 {
   return sh_readconf_setTime (c, SET_MAILTIME);
 }
 
-int sh_readconf_setFiletime (char * c)
+int sh_readconf_setFiletime (const char * c)
 {
   return sh_readconf_setTime (c, SET_FILETIME);
 }
 
-int sh_readconf_set_nice (char * c)
+int sh_readconf_set_nice (const char * c)
 {
   long val;
@@ -704 +711 @@
 
 #ifdef FANCY_LIBCAP
-int sh_readconf_setCaps(char * c)
+int sh_readconf_setCaps(const char * c)
 {
   int i;
@@ -718 +725 @@
   ShSectionType   section;
   ShSectionType   alt_section;
-  int (*func)(char * opt);
+  int (*func)(const char * opt);
 } cfg_options;
 
 #if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE)
-extern int sh_set_schedule_one(char * str);
-extern int sh_set_schedule_two(char * str);
+extern int sh_set_schedule_one(const char * str);
+extern int sh_set_schedule_two(const char * str);
 #endif
 #if defined (SH_WITH_SERVER)
-extern int sh_socket_use (char * c);
-extern int sh_socket_uid (char * c);
-extern int sh_socket_password (char * c);
-#endif
-
-/* Yes, this isn't very elegant ;)
- */
-#if defined(WITH_EXTERNAL)
-int sh_error_set_external_wrap (char * str) { 
-  return sh_error_set_external ((const char *) str);
-}
-#endif
-#if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE)
-int sh_files_setrecursion_wrap (char * str) { 
-  return sh_files_setrecursion ((const char *) str);
-}
-int sh_util_setchecksum_wrap (char * str) { 
-  return sh_util_setchecksum ((const char *) str);
-}
-#endif
-int sh_util_setlooptime_wrap (char * str) { 
-  return sh_util_setlooptime ((const char *) str);
-}
-#ifdef SH_WITH_MAIL
-int sh_error_setseverity_wrap (char * str) { 
-  return sh_error_setseverity ((const char *) str);
-}
-#endif
-int sh_calls_set_bind_addr_wrap (char * str) { 
-  return sh_calls_set_bind_addr ((const char *) str);
-}
-int sh_unix_setdeamon_wrap (char * str) { 
-  return sh_unix_setdeamon ((const char *) str);
-}
-int sh_error_setprint_wrap (char * str) { 
-  return sh_error_setprint ((const char *) str);
-}
-int sh_error_setlog_wrap (char * str) { 
-  return sh_error_setlog ((const char *) str);
-}
-int sh_error_set_syslog_wrap (char * str) { 
-  return sh_error_set_syslog ((const char *) str);
-}
-#ifdef HAVE_LIBPRELUDE
-int sh_error_set_prelude_wrap (char * str) { 
-  return sh_error_set_prelude ((const char *) str);
-}
-#endif
-#ifdef SH_WITH_CLIENT
-int sh_error_setexport_wrap (char * str) { 
-  return sh_error_setexport ((const char *) str);
-}
-#endif
-#ifdef SH_WITH_SERVER
-int sh_forward_set_strip_wrap (char * str) { 
-  return sh_forward_set_strip ((const char *) str);
-}
-int sh_unix_set_chroot_wrap (char * str) { 
-  return sh_unix_set_chroot ((const char *) str);
-}
-#endif
-#if defined(WITH_DATABASE)
-int sh_error_set_database_wrap (char * str) { 
-  return sh_error_set_database ((const char *) str);
-}
-#endif
- 
+extern int sh_socket_use (const char * c);
+extern int sh_socket_uid (const char * c);
+extern int sh_socket_password (const char * c);
+#endif
+
 cfg_options ext_table[] = {
 #if defined(WITH_EXTERNAL)
@@ -818 +763 @@
     sh_ext_add_or },
   { N_("externalseverity"),SH_SECTION_LOG,      SH_SECTION_EXTERNAL,  
-    sh_error_set_external_wrap },
+    sh_error_set_external },
   { N_("externalclass"),   SH_SECTION_LOG,      SH_SECTION_EXTERNAL,  
     sh_error_external_mask },
@@ -845 +790 @@
     set_enter_wrapper },
 #endif
+
 
 #if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE)
@@ -880 +826 @@
   { N_("file"),           SH_SECTION_USER1,      SH_SECTION_NONE, 
     sh_files_pushfile_user1 },
+  { N_("dir"),            SH_SECTION_USER2,      SH_SECTION_NONE, 
+    sh_files_pushdir_user2 },
+  { N_("file"),           SH_SECTION_USER2,      SH_SECTION_NONE, 
+    sh_files_pushfile_user2 },
+  { N_("dir"),            SH_SECTION_USER3,      SH_SECTION_NONE, 
+    sh_files_pushdir_user3 },
+  { N_("file"),           SH_SECTION_USER3,      SH_SECTION_NONE, 
+    sh_files_pushfile_user3 },
+  { N_("dir"),            SH_SECTION_USER4,      SH_SECTION_NONE, 
+    sh_files_pushdir_user4 },
+  { N_("file"),           SH_SECTION_USER4,      SH_SECTION_NONE, 
+    sh_files_pushfile_user4 },
   { N_("dir"),            SH_SECTION_PRELINK,    SH_SECTION_NONE, 
     sh_files_pushdir_prelink },
@@ -902 +860 @@
     sh_util_obscure_ok },
   { N_("setrecursionlevel"),  SH_SECTION_MISC,   SH_SECTION_NONE, 
-    sh_files_setrecursion_wrap },
+    sh_files_setrecursion },
   { N_("checksumtest"),       SH_SECTION_MISC,   SH_SECTION_NONE, 
-    sh_util_setchecksum_wrap },
+    sh_util_setchecksum },
   { N_("reportonlyonce"),     SH_SECTION_MISC,   SH_SECTION_NONE, 
     sh_files_reportonce },
@@ -953 +911 @@
     sh_files_redef_user1 },
 
+  { N_("redefuser2"),           SH_SECTION_MISC,   SH_SECTION_NONE, 
+    sh_files_redef_user2 },
+
+  { N_("redefuser3"),           SH_SECTION_MISC,   SH_SECTION_NONE, 
+    sh_files_redef_user3 },
+
+  { N_("redefuser4"),           SH_SECTION_MISC,   SH_SECTION_NONE, 
+    sh_files_redef_user4 },
+
   { N_("redefprelink"),         SH_SECTION_MISC,   SH_SECTION_NONE, 
     sh_files_redef_prelink },
@@ -961 +928 @@
   { N_("setprelinkchecksum"),   SH_SECTION_MISC,   SH_SECTION_NONE, 
     sh_prelink_set_hash },
+
   /* client or standalone
    */
@@ -977 +945 @@
     sh_socket_password },
   { N_("setstripdomain"),      SH_SECTION_SRV,  SH_SECTION_MISC, 
-    sh_forward_set_strip_wrap },
+    sh_forward_set_strip },
   { N_("useseparatelogs"),     SH_SECTION_SRV,  SH_SECTION_MISC, 
     set_flag_sep_log },
   { N_("setchrootdir"),        SH_SECTION_SRV,  SH_SECTION_MISC, 
-    sh_unix_set_chroot_wrap },
+    sh_unix_set_chroot },
   { N_("setclienttimelimit"),  SH_SECTION_SRV,  SH_SECTION_MISC, 
     sh_forward_set_time_limit },
@@ -1000 +968 @@
 #endif
 
-#ifdef SH_WITH_CLIENT
+#if defined(SH_WITH_CLIENT) || defined(SH_WITH_SERVER)
   { N_("exportseverity"),      SH_SECTION_LOG,  SH_SECTION_NONE, 
-    sh_error_setexport_wrap },
+    sh_error_setexport },
   { N_("exportclass"),         SH_SECTION_LOG,  SH_SECTION_NONE, 
     sh_error_export_mask },
+#if defined(SH_WITH_SERVER)
+  { N_("setlogserver"),        SH_SECTION_SRV,  SH_SECTION_MISC, 
+    sh_forward_setlogserver },
+#else
   { N_("setlogserver"),        SH_SECTION_CLT,  SH_SECTION_MISC, 
     sh_forward_setlogserver },
+#endif
 #endif
   { N_("setfilechecktime"),  SH_SECTION_MISC,   SH_SECTION_NONE, 
     sh_readconf_setFiletime },
   { N_("setlooptime"),     SH_SECTION_MISC,  SH_SECTION_NONE, 
-    sh_util_setlooptime_wrap },
+    sh_util_setlooptime },
 
 #ifdef SH_WITH_MAIL
   { N_("mailseverity"),      SH_SECTION_LOG,   SH_SECTION_NONE, 
-    sh_error_setseverity_wrap },
+    sh_error_setseverity },
   { N_("mailclass"),         SH_SECTION_LOG,   SH_SECTION_NONE, 
     sh_error_mail_mask },
@@ -1040 +1013 @@
 #endif
   { N_("setbindaddress"),    SH_SECTION_MISC,  SH_SECTION_NONE,
-    sh_calls_set_bind_addr_wrap },
+    sh_calls_set_bind_addr },
   { N_("daemon"),            SH_SECTION_MISC,  SH_SECTION_NONE, 
-    sh_unix_setdeamon_wrap },
+    sh_unix_setdeamon },
   { N_("samhainpath"),       SH_SECTION_MISC,  SH_SECTION_NONE, 
     sh_unix_self_hash },
@@ -1051 +1024 @@
 
   { N_("printseverity"),     SH_SECTION_LOG,   SH_SECTION_NONE, 
-    sh_error_setprint_wrap },
+    sh_error_setprint },
   { N_("printclass"),        SH_SECTION_LOG,   SH_SECTION_NONE, 
     sh_error_print_mask },
 
   { N_("logseverity"),       SH_SECTION_LOG,   SH_SECTION_NONE, 
-    sh_error_setlog_wrap },
+    sh_error_setlog },
   { N_("logclass"),          SH_SECTION_LOG,   SH_SECTION_NONE, 
     sh_error_log_mask },
 
   { N_("syslogseverity"),    SH_SECTION_LOG,   SH_SECTION_NONE, 
-    sh_error_set_syslog_wrap },
+    sh_error_set_syslog },
   { N_("syslogclass"),       SH_SECTION_LOG,   SH_SECTION_NONE, 
     sh_error_syslog_mask },
 #ifdef HAVE_LIBPRELUDE
   { N_("preludeseverity"),   SH_SECTION_LOG,   SH_SECTION_NONE, 
-    sh_error_set_prelude_wrap },
+    sh_error_set_prelude },
   { N_("preludeclass"),      SH_SECTION_LOG,   SH_SECTION_NONE, 
     sh_error_prelude_mask },
@@ -1147 +1120 @@
     N_("severityuser0"),
     N_("severityuser1"),
+    N_("severityuser2"),
+    N_("severityuser3"),
+    N_("severityuser4"),
     N_("severityprelink"),
     NULL
@@ -1163 +1139 @@
     SH_ERR_T_USER0,       
     SH_ERR_T_USER1,       
+    SH_ERR_T_USER2,       
+    SH_ERR_T_USER3,       
+    SH_ERR_T_USER4,       
     SH_ERR_T_PRELINK,       
   };