new upstream release (3.3.0); modify package compatibility for Stretch

[ossec-hids.git] / src / util / verify-agent-conf.c

diff --git a/src/util/verify-agent-conf.c b/src/util/verify-agent-conf.c
old mode 100755 (executable)
new mode 100644 (file)
index ee684d0..1e9f98f
--- a/src/util/verify-agent-conf.c
+++ b/src/util/verify-agent-conf.c
@@ -1,5 +1,3 @@
-/* @(#) $Id$ */
-
 /* Copyright (C) 2010 Trend Micro Inc.
  * All right reserved.
  *
@@ -9,42 +7,78 @@
  * Foundation
  */
 
-
 #include "shared.h"
 #include "config/localfile-config.h"
 #include "config/config.h"
 #include "logcollector/logcollector.h"
 
-
 #undef ARGV0
 #define ARGV0 "verify-agent-conf"
 
+/* Prototypes */
+static void helpmsg(void) __attribute__((noreturn));
 
 
-/* main: v0.3: 2005/04/04 */
+static void helpmsg()
+{
+    printf("\nOSSEC HIDS %s: Verify agent.conf syntax for errors.\n", ARGV0);
+    printf("Usage:  %s [-f <agent.conf file>]\n\n", ARGV0);
+    printf("Available options:\n");
+    printf("\t-h          This help message.\n");
+    printf("\t-f          Full file name and path to config file to be tested.\n");
+    printf("\t            If this option is not specified the following default\n");
+    printf("\t            will be used.\n");
+    printf(" ");
+    printf("\t            Validation is successful, if no errors are shown.\n");
+    exit(1);
+}
+
 int main(int argc, char **argv)
 {
+    const char *ar = AGENTCONFIG;
+    int c = 0;
     int modules = 0;
     logreader_config log_config;
 
-
-    /* Setting the name */
+    /* Set the name */
     OS_SetName(ARGV0);
-        
 
-    modules|= CLOCALFILE;
-    modules|= CAGENT_CONFIG;
-    log_config.config = NULL;
-    if(ReadConfig(modules, AGENTCONFIG, &log_config, NULL) < 0)
-    {
-        return(OS_INVALID);
+    /* User arguments */
+    if (argc > 1) {
+        while ((c = getopt(argc, argv, "Vdhf:")) != -1) {
+            switch (c) {
+                case 'V':
+                    print_version();
+                    break;
+                case 'h':
+                    helpmsg();
+                    break;
+                case 'd':
+                    nowDebug();
+                    break;
+                case 'f':
+                    if (!optarg) {
+                        merror("%s: -f needs an argument", ARGV0);
+                        helpmsg();
+                    }
+                    ar = optarg;
+                    break;
+                default:
+                    helpmsg();
+                    break;
+            }
+        }
     }
 
-    logff = log_config.config;       
-
-    return(0);
+    printf("\n%s: Verifying [%s].\n\n", ARGV0, ar);
 
+    modules |= CLOCALFILE;
+    modules |= CAGENT_CONFIG;
+    log_config.config = NULL;
+    if (ReadConfig(modules, ar, &log_config, NULL) < 0) {
+        return (OS_INVALID);
+    }
 
+    return (0);
 }
 
-/* EOF */