Changeset 3dba97d in code

Timestamp:

Mar 5, 2014, 9:41:56 PM (11 years ago)

Author:

Mike Belopuhov <mike@…>

Branches:

master

Children:

e54f151

Parents:

b28dd0e

Message:

Add a logging switch toggle and a prefix for a nicer chroot

Files:

• icbd.8 (modified) (2 diffs)
• icbd.c (modified) (5 diffs)
• logger.c (modified) (3 diffs)

icbd.8

@@ -27 +27 @@
 .Fl G Ar group1 Ns Op , Ns Ar ...
 .Oc
+.Op Fl L Ar prefix
 .Op Fl M Ar modtab
 .Op Fl S Ar name
@@ -67 +68 @@
 .Nm
 to create specified groups at startup.
+.It Fl L Ar prefix
+Enables logging of all public messages in all groups and specifies a
+directory inside the chroot that is owned and is writable by the
+.Nm
+user.
+The server will create subdirectories matching those of the group names
+and place log files inside one file per month.
 .It Fl M Ar modtab
 Specifies a moderator table that can be used to restrict users who

icbd.c

@@ -43 +43 @@
 #include "icbd.h"
 
-extern char *__progname;
-
 uint64_t sessionid;
 char modtab[ICB_MTABLEN][ICB_MAXNICKLEN];
@@ -51 +49 @@
 int  creategroups;
 int  foreground;
+char logprefix[MAXPATHLEN/2];
+int  dologging;
 int  verbose;
 
@@ -84 +84 @@
         icb_init(&ic);
 
-        while ((ch = getopt(argc, argv, "46CdG:M:S:v")) != -1)
+        while ((ch = getopt(argc, argv, "46CdG:M:L:S:v")) != -1)
                 switch (ch) {
                 case '4':
@@ -100 +100 @@
                 case 'G':
                         icbd_grplist(optarg);
+                        break;
+                case 'L':
+                        strlcpy(logprefix, optarg, sizeof logprefix);
+                        dologging++;
                         break;
                 case 'M':
@@ -301 +305 @@
 usage(void)
 {
+        extern char *__progname;
+
         (void)fprintf(stderr, "usage: %s [-46Cdv] [-G group1[,group2,...]] "
-           "[-M modtab]\n\t[-S name] [[addr][:port] ...]\n",  __progname);
+           "[-L prefix] [-M modtab]\n\t[-S name] [[addr][:port] ...]\n",
+            __progname);
         exit(EX_USAGE);
 }

logger.c

@@ -60 +60 @@
 struct event ev_tick;
 
+extern char logprefix[MAXPATHLEN/2];
+extern int dologging;
+
 int
 logger_init(void)
@@ -177 +180 @@
         FILE *fp = NULL;
 
-        if (mkdir(group, 0755) < 0 && errno != EEXIST) {
+        snprintf(path, sizeof path, "%s/%s", logprefix, group);
+        if (mkdir(path, 0755) < 0 && errno != EEXIST) {
                 syslog(LOG_ERR, "%s: %m", group);
                 return (NULL);
         }
-        snprintf(path, sizeof path, "%s/%s", group, file_ts);
+        snprintf(path, sizeof path, "%s/%s/%s", logprefix, group, file_ts);
         if ((fp = fopen(path, "a")) == NULL) {
                 syslog(LOG_ERR, "%s: %m", path);
@@ -200 +204 @@
         struct iovec iov[2];
 
+        if (!dologging)
+                return;
+
         strlcpy(e.group, group, ICB_MAXGRPLEN);
         strlcpy(e.nick, nick, ICB_MAXNICKLEN);