Changeset 20 for trunk/src/sh_readconf.c

Timestamp:

Feb 13, 2006, 11:54:42 PM (19 years ago)

Author:

rainer

Message:

Enable command-line parsing for prelude, and make prelude regression test safer.

File:

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

trunk/src/sh_readconf.c

@@ -731 +731 @@
 #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
+ 
 cfg_options ext_table[] = {
 #if defined(WITH_EXTERNAL)
@@ -756 +818 @@
     sh_ext_add_or },
   { N_("externalseverity"),SH_SECTION_LOG,      SH_SECTION_EXTERNAL,  
-    sh_error_set_external },
+    sh_error_set_external_wrap },
   { N_("externalclass"),   SH_SECTION_LOG,      SH_SECTION_EXTERNAL,  
     sh_error_external_mask },
@@ -840 +902 @@
     sh_util_obscure_ok },
   { N_("setrecursionlevel"),  SH_SECTION_MISC,   SH_SECTION_NONE, 
-    sh_files_setrecursion },
+    sh_files_setrecursion_wrap },
   { N_("checksumtest"),       SH_SECTION_MISC,   SH_SECTION_NONE, 
-    sh_util_setchecksum },
+    sh_util_setchecksum_wrap },
   { N_("reportonlyonce"),     SH_SECTION_MISC,   SH_SECTION_NONE, 
     sh_files_reportonce },
@@ -915 +977 @@
     sh_socket_password },
   { N_("setstripdomain"),      SH_SECTION_SRV,  SH_SECTION_MISC, 
-    sh_forward_set_strip },
+    sh_forward_set_strip_wrap },
   { N_("useseparatelogs"),     SH_SECTION_SRV,  SH_SECTION_MISC, 
     set_flag_sep_log },
   { N_("setchrootdir"),        SH_SECTION_SRV,  SH_SECTION_MISC, 
-    sh_unix_set_chroot },
+    sh_unix_set_chroot_wrap },
   { N_("setclienttimelimit"),  SH_SECTION_SRV,  SH_SECTION_MISC, 
     sh_forward_set_time_limit },
@@ -940 +1002 @@
 #ifdef SH_WITH_CLIENT
   { N_("exportseverity"),      SH_SECTION_LOG,  SH_SECTION_NONE, 
-    sh_error_setexport },
+    sh_error_setexport_wrap },
   { N_("exportclass"),         SH_SECTION_LOG,  SH_SECTION_NONE, 
     sh_error_export_mask },
@@ -949 +1011 @@
     sh_readconf_setFiletime },
   { N_("setlooptime"),     SH_SECTION_MISC,  SH_SECTION_NONE, 
-    sh_util_setlooptime },
+    sh_util_setlooptime_wrap },
 
 #ifdef SH_WITH_MAIL
   { N_("mailseverity"),      SH_SECTION_LOG,   SH_SECTION_NONE, 
-    sh_error_setseverity },
+    sh_error_setseverity_wrap },
   { N_("mailclass"),         SH_SECTION_LOG,   SH_SECTION_NONE, 
     sh_error_mail_mask },
@@ -978 +1040 @@
 #endif
   { N_("setbindaddress"),    SH_SECTION_MISC,  SH_SECTION_NONE,
-    sh_calls_set_bind_addr },
+    sh_calls_set_bind_addr_wrap },
   { N_("daemon"),            SH_SECTION_MISC,  SH_SECTION_NONE, 
-    sh_unix_setdeamon },
+    sh_unix_setdeamon_wrap },
   { N_("samhainpath"),       SH_SECTION_MISC,  SH_SECTION_NONE, 
     sh_unix_self_hash },
@@ -989 +1051 @@
 
   { N_("printseverity"),     SH_SECTION_LOG,   SH_SECTION_NONE, 
-    sh_error_setprint },
+    sh_error_setprint_wrap },
   { N_("printclass"),        SH_SECTION_LOG,   SH_SECTION_NONE, 
     sh_error_print_mask },
 
   { N_("logseverity"),       SH_SECTION_LOG,   SH_SECTION_NONE, 
-    sh_error_setlog },
+    sh_error_setlog_wrap },
   { N_("logclass"),          SH_SECTION_LOG,   SH_SECTION_NONE, 
     sh_error_log_mask },
 
   { N_("syslogseverity"),    SH_SECTION_LOG,   SH_SECTION_NONE, 
-    sh_error_set_syslog },
+    sh_error_set_syslog_wrap },
   { 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 },
+    sh_error_set_prelude_wrap },
   { N_("preludeclass"),      SH_SECTION_LOG,   SH_SECTION_NONE, 
     sh_error_prelude_mask },