X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Fagentlessd%2Fmain.c;h=0c020e8e5005cc759b232f1cb1784b7253eefee2;hb=3f728675941dc69d4e544d3a880a56240a6e394a;hp=1d3ce3be5718a091104d9a17e679766b005b63c9;hpb=6ef2f786c6c8ead94841b5f93baf9f43421f08c8;p=ossec-hids.git

diff --git a/src/agentlessd/main.c b/src/agentlessd/main.c
old mode 100755
new mode 100644
index 1d3ce3b..0c020e8
--- a/src/agentlessd/main.c
+++ b/src/agentlessd/main.c
@@ -1,6 +1,3 @@
-/* @(#) $Id: ./src/agentlessd/main.c, 2011/09/08 dcid Exp $
- */
-
 /* Copyright (C) 2009 Trend Micro Inc.
  * All rights reserved.
  *
@@ -10,149 +7,160 @@
  * Foundation
  */
 
-
 #include "shared.h"
 #include "agentlessd.h"
 #include "config/config.h"
 
+/* Prototypes */
+static void help_agentlessd(void) __attribute__((noreturn));
+
 
+/* Print help statement */
+static void help_agentlessd()
+{
+    print_header();
+    print_out("  %s: -[Vhdtf] [-u user] [-g group] [-c config] [-D dir]", ARGV0);
+    print_out("    -V          Version and license message");
+    print_out("    -h          This help message");
+    print_out("    -d          Execute in debug mode. This parameter");
+    print_out("                can be specified multiple times");
+    print_out("                to increase the debug level.");
+    print_out("    -t          Test configuration");
+    print_out("    -f          Run in foreground");
+    print_out("    -u <user>   User to run as (default: %s)", USER);
+    print_out("    -g <group>  Group to run as (default: %s)", GROUPGLOBAL);
+    print_out("    -c <config> Configuration file to use (default: %s)", DEFAULTCPATH);
+    print_out("    -D <dir>    Directory to chroot into (default: %s)", DEFAULTDIR);
+    print_out(" ");
+    exit(1);
+}
 
 int main(int argc, char **argv)
 {
     int c, test_config = 0, run_foreground = 0;
-    int uid=0,gid=0;
-    char *dir  = DEFAULTDIR;
-    char *user = USER;
-    char *group = GROUPGLOBAL;
-    char *cfg = DEFAULTCPATH;
-
-
-    /* Setting the name */
+    uid_t uid;
+    gid_t gid;
+    const char *dir  = DEFAULTDIR;
+    const char *user = USER;
+    const char *group = GROUPGLOBAL;
+    const char *cfg = DEFAULTCPATH;
+
+    /* Set the name */
     OS_SetName(ARGV0);
 
-
-    while((c = getopt(argc, argv, "Vdhtfu:g:D:c:")) != -1){
-        switch(c){
+    while ((c = getopt(argc, argv, "Vdhtfu:g:D:c:")) != -1) {
+        switch (c) {
             case 'V':
                 print_version();
                 break;
             case 'h':
-                help(ARGV0);
+                help_agentlessd();
                 break;
             case 'd':
                 nowDebug();
                 break;
             case 'f':
                 run_foreground = 1;
-            break;
+                break;
             case 'u':
-                if(!optarg)
-                    ErrorExit("%s: -u needs an argument",ARGV0);
-                user=optarg;
+                if (!optarg) {
+                    ErrorExit("%s: -u needs an argument", ARGV0);
+                }
+                user = optarg;
                 break;
             case 'g':
-                if(!optarg)
-                    ErrorExit("%s: -g needs an argument",ARGV0);
-                group=optarg;
+                if (!optarg) {
+                    ErrorExit("%s: -g needs an argument", ARGV0);
+                }
+                group = optarg;
                 break;
             case 'D':
-                if(!optarg)
-                    ErrorExit("%s: -D needs an argument",ARGV0);
-                dir=optarg;
+                if (!optarg) {
+                    ErrorExit("%s: -D needs an argument", ARGV0);
+                }
+                dir = optarg;
                 break;
             case 'c':
-                if(!optarg)
-                    ErrorExit("%s: -c needs an argument",ARGV0);
+                if (!optarg) {
+                    ErrorExit("%s: -c needs an argument", ARGV0);
+                }
                 cfg = optarg;
                 break;
             case 't':
                 test_config = 1;
                 break;
             default:
-                help(ARGV0);
+                help_agentlessd();
                 break;
         }
-
     }
 
-
-    /* Starting daemon */
-    debug1(STARTED_MSG,ARGV0);
-
+    /* Start daemon */
+    debug1(STARTED_MSG, ARGV0);
 
     /* Check if the user/group given are valid */
     uid = Privsep_GetUser(user);
     gid = Privsep_GetGroup(group);
-    if((uid < 0)||(gid < 0))
-        ErrorExit(USER_ERROR,ARGV0,user,group);
-
+    if (uid == (uid_t) - 1 || gid == (gid_t) - 1) {
+        ErrorExit(USER_ERROR, ARGV0, user, group);
+    }
 
-    /* Reading config. */
+    /* Read config */
     c = 0;
-    c|= CAGENTLESS;
+    c |= CAGENTLESS;
     lessdc.entries = NULL;
     lessdc.queue = 0;
 
-    if(ReadConfig(c, cfg, &lessdc, NULL) < 0)
-    {
+    if (ReadConfig(c, cfg, &lessdc, NULL) < 0) {
         ErrorExit(XML_INV_AGENTLESS, ARGV0);
     }
 
-
     /* Exit here if test config is set */
-    if(test_config)
+    if (test_config) {
         exit(0);
+    }
 
-
-    /* Going on daemon mode */
-    if(!run_foreground)
-    {
+    /* Continue in daemon mode */
+    if (!run_foreground) {
         nowDaemon();
         goDaemonLight();
     }
-    chdir(dir);
 
+    if (chdir(dir) == -1) {
+        ErrorExit(CHDIR_ERROR, ARGV0, dir, errno, strerror(errno));
+    }
 
-    /* Exiting if not configured. */
-    if(!lessdc.entries)
-    {
+    /* Exit if not configured */
+    if (!lessdc.entries) {
         verbose("%s: INFO: Not configured. Exiting.", ARGV0);
         exit(0);
     }
 
+    /* Privilege separation */
+    if (Privsep_SetGroup(gid) < 0) {
+        ErrorExit(SETGID_ERROR, ARGV0, group, errno, strerror(errno));
+    }
 
-    /* Privilege separation */	
-    if(Privsep_SetGroup(gid) < 0)
-        ErrorExit(SETGID_ERROR,ARGV0,group);
-
-
-    /* Changing user */
-    if(Privsep_SetUser(uid) < 0)
-        ErrorExit(SETUID_ERROR,ARGV0,user);
-
-
-    debug1(PRIVSEP_MSG,ARGV0,dir,user);
-
+    /* Change user */
+    if (Privsep_SetUser(uid) < 0) {
+        ErrorExit(SETUID_ERROR, ARGV0, user, errno, strerror(errno));
+    }
 
+    debug1(CHROOT_MSG, ARGV0, dir);
+    debug1(PRIVSEP_MSG, ARGV0, user);
 
     /* Signal manipulation */
     StartSIG(ARGV0);
 
-
-
-    /* Creating PID files */
-    if(CreatePID(ARGV0, getpid()) < 0)
-        ErrorExit(PID_ERROR,ARGV0);
-
+    /* Create PID files */
+    if (CreatePID(ARGV0, getpid()) < 0) {
+        ErrorExit(PID_ERROR, ARGV0);
+    }
 
     /* Start up message */
     verbose(STARTUP_MSG, ARGV0, (int)getpid());
 
-
-    /* the real daemon now */	
+    /* The real daemon now */
     Agentlessd();
-    exit(0);
 }
 
-
-/* EOF */