From 40cd22138c1784f6df122678d3d497f08d5985b9 Mon Sep 17 00:00:00 2001
From: awiddersheim <awiddersheim@hotmail.com>
Date: Sun, 25 May 2014 12:22:08 -0400
Subject: [PATCH] Fix ossec-agentd comand line arguments

Stop gap fixes to ossec-agentd for issues raised in #207.

This commit makes the '-c' option work so a user can specify an alternate
configuration location.
---
 src/client-agent/main.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/client-agent/main.c b/src/client-agent/main.c
index cfb366125..31d437bca 100755
--- a/src/client-agent/main.c
+++ b/src/client-agent/main.c
@@ -41,6 +41,7 @@ int main(int argc, char **argv)
     char *dir = DEFAULTDIR;
     char *user = USER;
     char *group = GROUPGLOBAL;
+    char *xmlcfg = DEFAULTCPATH;
 
     int uid = 0;
     int gid = 0;
@@ -51,7 +52,7 @@ int main(int argc, char **argv)
     OS_SetName(ARGV0);
 
 
-    while((c = getopt(argc, argv, "Vtdfhu:g:D:")) != -1){
+    while((c = getopt(argc, argv, "Vtdfhu:g:D:c:")) != -1){
         switch(c){
             case 'V':
                 print_version();
@@ -76,14 +77,19 @@ int main(int argc, char **argv)
                     ErrorExit("%s: -g needs an argument",ARGV0);
                 group = optarg;
                 break;
-            case 't':
-                test_config = 1;
-                break;
             case 'D':
                 if(!optarg)
                     ErrorExit("%s: -D needs an argument",ARGV0);
                 dir = optarg;
                 break;
+            case 'c':
+                if(!optarg)
+                    ErrorExit("%s: -c needs an argument.",ARGV0);
+                xmlcfg = optarg;
+                break;
+            case 't':
+                test_config = 1;
+                break;
         }
     }
 
@@ -113,7 +119,7 @@ int main(int argc, char **argv)
 
 
     /* Reading config */
-    if(ClientConf(DEFAULTCPATH) < 0)
+    if(ClientConf(xmlcfg) < 0)
     {
         ErrorExit(CLIENT_ERROR,ARGV0);
     }