Description: Added -V switch to all daemons

Reviewed by: Daniel Cid, coded by Meir Michanie Bug:
qqlover · Sep 4, 2006 · aeb3d57 · aeb3d57
1 parent 1855103
commit aeb3d57
Show file tree

Hide file tree

Showing 13 changed files with 391 additions and 10 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/src/addagent/main.c b/src/addagent/main.c
@@ -111,6 +111,9 @@ int main(int argc, char **argv)
             case 'Q':
                 printf(EXIT);
                 exit(0);    
+	    case 'V':
+		print_version();   
+		break;
             default:    
                 printf("\n ** Invalid Action ** \n\n");
                 break;            

diff --git a/src/analysisd/analysisd.c b/src/analysisd/analysisd.c
@@ -126,8 +126,11 @@ int main(int argc, char **argv)
     memset(prev_month, '\0', 4);
     hourly_alerts = 0;
 
-    while((c = getopt(argc, argv, "tdhu:g:D:c:")) != -1){
+    while((c = getopt(argc, argv, "Vtdhu:g:D:c:")) != -1){
         switch(c){
+	    case 'V':
+		print_version();
+		break;
             case 'h':
                 help();
                 break;

diff --git a/src/client-agent/main.c b/src/client-agent/main.c
@@ -52,8 +52,11 @@ int main(int argc, char **argv)
     OS_SetName(ARGV0);
 
 
-    while((c = getopt(argc, argv, "tdhu:g:D:")) != -1){
+    while((c = getopt(argc, argv, "Vtdhu:g:D:")) != -1){
         switch(c){
+            case 'V':
+                print_version();
+                break;
             case 'h':
                 help();
                 break;

diff --git a/src/headers/defs.h b/src/headers/defs.h
@@ -33,11 +33,15 @@
 
 /* Some Global names */
 #define __name      "OSSEC HIDS"
-#define __version   "v0.9-1"
+#define __version   "v0.9-1b"
 #define __author    "Daniel B. Cid"
 #define __contact   "[email protected]"
 #define __site      "http://www.ossec.net"
-
+#define __license   "\
+This program is free software; you can redistribute it and/or modify\n\
+it under the terms of the GNU General Public License as published by\n\
+the Free Software Foundation; either version 2 of the License, or\n\
+(at your option) any later version.\n"
 
 /* Maximum allowed PID */
 #ifdef SOLARIS

diff --git a/src/headers/help.h b/src/headers/help.h
@@ -16,5 +16,6 @@
 
 #define __HELP_H
 void help();
+void print_version();
 
 #endif
diff --git a/src/logcollector/main.c b/src/logcollector/main.c
@@ -48,10 +48,13 @@ int main(int argc, char **argv)
     OS_SetName(ARGV0);
 
 
-    while((c = getopt(argc, argv, "tdhD:c:")) != -1)
+    while((c = getopt(argc, argv, "VtdhD:c:")) != -1)
     {
         switch(c)
         {
+            case 'V':
+                print_version();
+                break;
             case 'h':
                 help();
                 break;

diff --git a/src/monitord/main.c b/src/monitord/main.c
@@ -30,8 +30,11 @@ int main(int argc, char **argv)
     OS_SetName(ARGV0);
 
 
-    while((c = getopt(argc, argv, "dhtu:g:D:c:")) != -1){
+    while((c = getopt(argc, argv, "Vdhtu:g:D:c:")) != -1){
         switch(c){
+            case 'V':
+                print_version();
+                break;
             case 'h':
                 help();
                 break;

diff --git a/src/os_maild/maild.c b/src/os_maild/maild.c
@@ -42,8 +42,11 @@ int main(int argc, char **argv)
     OS_SetName(ARGV0);
 
 
-    while((c = getopt(argc, argv, "dhtu:g:D:c:")) != -1){
+    while((c = getopt(argc, argv, "Vdhtu:g:D:c:")) != -1){
         switch(c){
+            case 'V':
+                print_version();
+                break;
             case 'h':
                 help();
                 break;

diff --git a/src/remoted/main.c b/src/remoted/main.c
@@ -31,8 +31,11 @@ int main(int argc, char **argv)
     OS_SetName(ARGV0);
 
 
-    while((c = getopt(argc, argv, "dthu:g:D:")) != -1){
+    while((c = getopt(argc, argv, "Vdthu:g:D:")) != -1){
         switch(c){
+            case 'V':
+                print_version();
+                break;
             case 'h':
                 help();
                 break;

diff --git a/src/rootcheck/rootcheck.c b/src/rootcheck/rootcheck.c
@@ -102,10 +102,13 @@ int rootcheck_init(int test_config)
 #ifndef OSSECHIDS
     rootcheck.notify = SYSLOG;
     rootcheck.daemon = 0;
-    while((c = getopt(argc, argv, "strdhD:c:")) != -1)
+    while((c = getopt(argc, argv, "VstrdhD:c:")) != -1)
     {
         switch(c)
         {
+            case 'V':
+                print_version();
+                break;
             case 'h':
                 rootcheck_help();
                 break;

diff --git a/src/shared/help.c b/src/shared/help.c
@@ -33,6 +33,7 @@ void help()
     {
         print_out("");
         print_out("  %s: -[thd] [-u user] [-g group] [-c config]",daemons[i]);
+        print_out("    -V          Version and license message");
         print_out("    -h          This help message");
         print_out("    -d          Execute in debug mode");
         print_out("    -t          Test configuration");
@@ -45,4 +46,13 @@ void help()
     exit(1);
 }
 
+void print_version()
+{
+    print_out("");
+    print_out("%s %s - %s", __name, __version, __author);
+    print_out("");
+    print_out("%s",__license);
+    exit(1);
+}
+
 /* EOF */
diff --git a/src/syscheckd/syscheck.c b/src/syscheckd/syscheck.c
@@ -111,10 +111,13 @@ int main(int argc, char **argv)
     OS_SetName(ARGV0);
 
 
-    while((c = getopt(argc, argv, "tSsdhD:c:")) != -1)
+    while((c = getopt(argc, argv, "VtSsdhD:c:")) != -1)
     {
         switch(c)
         {
+            case 'V':
+                print_version();
+                break;
             case 's':
                 init = 1;
                 break;