Made flag checking for ADDCHAN actually consistent with CHANFLAGS.

diff --git a/chanserv/chancmds/addchan.c b/chanserv/chancmds/addchan.c
index 6c0601e295530a218db319e5c87de73cdaafb753..b666f0dd54c6fa90d3df4e9100448b0c6f667cc0 100644 (file)
--- a/chanserv/chancmds/addchan.c
+++ b/chanserv/chancmds/addchan.c
@@ -67,8 +67,11 @@ int csc_doaddchan(void *source, int cargc, char **cargv) {
   if (cargc>2) {
     flags=0;
     setflags(&flags, QCFLAG_ALL, cargv[2], rcflags, REJECT_NONE);
-    if (!UIsDev(rup))
+    /* Apply relevant policy */
+    if (!UIsDev(rup)) {
+      flags &= QCFLAG_USERCONTROL;
       flags |= QCFLAG_JOINED;
+    }
   } else {
     flags = (QCFLAG_JOINED);
   }