Merge branch 'maint' into next

[paraslash.git] / daemon.c

diff --git a/daemon.c b/daemon.c
index 2f706b01bde62c8821dc76e66ad387a905782d91..c855daa19e194ee5d6e432f89771b907bd909340 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -5,12 +5,14 @@
  */
 
 /** \file daemon.c Some helpers for programs that detach from the console. */
-#include "para.h"
-#include "daemon.h"
+
+#include <regex.h>
 #include <pwd.h>
 #include <sys/types.h> /* getgrnam() */
 #include <grp.h>
 
+#include "para.h"
+#include "daemon.h"
 #include "string.h"
 #include "color.h"
 
@@ -58,25 +60,6 @@ void daemon_set_default_log_colors(void)
        }
 }
 
-static int get_loglevel_by_name(const char *txt, size_t n)
-{
-       if (!strncasecmp(txt, "debug", n))
-               return LL_DEBUG;
-       if (!strncasecmp(txt, "info", n))
-               return LL_INFO;
-       if (!strncasecmp(txt, "notice", n))
-               return LL_NOTICE;
-       if (!strncasecmp(txt, "warning", n))
-               return LL_WARNING;
-       if (!strncasecmp(txt, "error", n))
-               return LL_ERROR;
-       if (!strncasecmp(txt, "crit", n))
-               return LL_CRIT;
-       if (!strncasecmp(txt, "emerg", n))
-               return LL_EMERG;
-       return -1;
-}
-
 /**
  * Set the color for one loglevel.
  *
@@ -93,7 +76,7 @@ int daemon_set_log_color(char const *arg)
 
        if (!p)
                goto err;
-       ret = get_loglevel_by_name(arg, p - arg);
+       ret = get_loglevel_by_name(arg);
        if (ret < 0)
                goto err;
        ll = ret;
@@ -122,13 +105,16 @@ void daemon_set_logfile(char *logfile_name)
 }
 
 /**
- * Supress log messages with severity lower than the given loglevel.
+ * Suppress log messages with severity lower than the given loglevel.
  *
  * \param loglevel The smallest level that should be logged.
  */
-void daemon_set_loglevel(int loglevel)
+void daemon_set_loglevel(char *loglevel)
 {
-       me->loglevel = loglevel;
+       int ret = get_loglevel_by_name(loglevel);
+
+       assert(ret >= 0);
+       me->loglevel = ret;
 }
 
 /**
@@ -183,7 +169,6 @@ void daemonize(void)
                goto err;
        if (chdir("/") < 0)
                goto err;
-       umask(0);
        null = open("/dev/null", O_RDONLY);
        if (null < 0)
                goto err;
@@ -234,11 +219,10 @@ void daemon_open_log_or_die(void)
 /**
  * Log the startup message containing the paraslash version.
  */
-void log_welcome(const char *whoami, int loglevel)
+void log_welcome(const char *whoami)
 {
        PARA_INFO_LOG("welcome to %s " PACKAGE_VERSION " ("BUILD_DATE")\n",
                whoami);
-       PARA_DEBUG_LOG("using loglevel %d\n", loglevel);
 }
 
 /**
@@ -287,7 +271,11 @@ void drop_privileges_or_die(const char *username, const char *groupname)
                exit(EXIT_FAILURE);
        }
        PARA_INFO_LOG("dropping root privileges\n");
-       setuid(p->pw_uid);
+       if (setuid(p->pw_uid) < 0) {
+               PARA_EMERG_LOG("failed to set effective user ID (%s)",
+                       strerror(errno));
+               exit(EXIT_FAILURE);
+       }
        PARA_DEBUG_LOG("uid: %d, euid: %d\n", (int)getuid(), (int)geteuid());
 }
 
@@ -301,7 +289,7 @@ void drop_privileges_or_die(const char *username, const char *groupname)
  * set_or_get equal to \p UPTIME_GET return the uptime.
 
  * \return Zero if called with \a set_or_get equal to \p UPTIME_SET, the number
- * of seconds ellapsed since the last reset otherwise.
+ * of seconds elapsed since the last reset otherwise.
  *
  * \sa time(2), difftime(3).
  */
@@ -345,7 +333,7 @@ __printf_2_3 void para_log(int ll, const char* fmt,...)
        FILE *fp;
        struct tm *tm;
        time_t t1;
-       char *color, str[MAXLINE] = "";
+       char *color;
 
        ll = PARA_MIN(ll, NUM_LOGLEVELS - 1);
        ll = PARA_MAX(ll, LL_DEBUG);
@@ -356,11 +344,11 @@ __printf_2_3 void para_log(int ll, const char* fmt,...)
        color = daemon_test_flag(DF_COLOR_LOG)? me->log_colors[ll] : NULL;
        if (color)
                fprintf(fp, "%s", color);
-       if (daemon_test_flag(DF_LOG_TIME)) {
-               /* date and time */
+       if (daemon_test_flag(DF_LOG_TIME)) { /* print date and time */
+               char str[100];
                time(&t1);
                tm = localtime(&t1);
-               strftime(str, MAXLINE, "%b %d %H:%M:%S", tm);
+               strftime(str, sizeof(str), "%b %d %H:%M:%S", tm);
                fprintf(fp, "%s ", str);
        }
        if (daemon_test_flag(DF_LOG_HOSTNAME)) {