Changeset 270fd23 in code

Timestamp:

Mar 7, 2014, 3:20:42 PM (11 years ago)

Author:

Florian Obser <florian@…>

Branches:

master

Children:

a2fadb4

Parents:

a6b8c8d

Message:

Move modtab into the chroot and make it reloadable by SIGHUB
input mikeb, manpage bits benno

Files:

• icbd.8 (modified) (1 diff)
• icbd.c (modified) (6 diffs)

icbd.8

@@ -78 +78 @@
 Specifies a moderator table that can be used to restrict users who
 can be granted with moderation of any group.
+The
 .Ar modtab
 file contains one nick per line; empty lines and lines starting with
 a hash symbol are ignored.
+The
+.Ar modtab
+file is inside the chroot.
+The
+.Ar modtab
+file is read at startup and whenever a hangup signal is received.
 .It Fl n
 Disable DNS resolver.

icbd.c

@@ -44 +44 @@
 
 uint64_t sessionid;
+char modtabpath[MAXPATHLEN];
 char modtab[ICB_MTABLEN][ICB_MAXNICKLEN];
 int  modtabcnt;
@@ -66 +67 @@
 void icbd_restrict(void);
 void icbd_write(struct icb_session *, char *, ssize_t);
+void icbd_signal(int);
 
 static inline int icbd_session_cmp(struct icb_session *, struct icb_session *);
@@ -80 +82 @@
 main(int argc, char *argv[])
 {
+        struct event ev_sig;
         struct icbd_callbacks ic = { icbd_drop, icbd_log, icbd_write };
         const char *cause = NULL;
@@ -112 +115 @@
                         break;
                 case 'M':
-                        icbd_modtab(optarg);
+                        strlcpy(modtabpath, optarg, sizeof modtabpath);
                         break;
                 case 'n':
@@ -236 +239 @@
 
         (void)signal(SIGPIPE, SIG_IGN);
+        if (strlen(modtabpath) > 0) {
+                icbd_modtab(modtabpath);
+                signal_set(&ev_sig, SIGHUP,
+                    (void (*)(int, short, void *))icbd_signal, NULL);
+                signal_add(&ev_sig, NULL);
+        }
 
         (void)event_dispatch();
@@ -561 +570 @@
 }
 
+void
+icbd_signal(int sig)
+{
+        switch (sig) {
+        case SIGHUP:
+                if (strlen(modtabpath) > 0)
+                        icbd_modtab(modtabpath);
+                break;
+        default:
+                syslog(LOG_WARNING, "unexpected signal %d", sig);
+                break;
+        }
+}
+
 time_t
 getmonotime(void)