added modes parameter to srvx.conf to control user modes

[srvx.git] / src / proto-bahamut.c

diff --git a/src/proto-bahamut.c b/src/proto-bahamut.c
index d0828f1c0c2c86b72064750be33672a3a66f968f..689e26cfbc4016bfc0b0a14d550c53dfab643bc8 100644 (file)
--- a/src/proto-bahamut.c
+++ b/src/proto-bahamut.c
@@ -171,7 +171,7 @@ AddUser(struct server* uplink, const char *nick, const char *ident, const char *
 }
 
 struct userNode *
-AddService(const char *nick, const char *desc, const char *hostname) {
+AddService(const char *nick, const char *modes, const char *desc, const char *hostname) {
     time_t timestamp = now;
     struct userNode *old_user = GetUserH(nick);
     struct in_addr ipaddr = { INADDR_LOOPBACK };
@@ -182,7 +182,7 @@ AddService(const char *nick, const char *desc, const char *hostname) {
     }
     if (!hostname)
         hostname = self->name;
-    return AddUser(self, nick, nick, hostname, "+oikr", desc, timestamp, ipaddr, 0);
+    return AddUser(self, nick, nick, hostname, modes ? modes : "+oikr", desc, timestamp, ipaddr, 0);
 }
 
 struct userNode *
@@ -271,6 +271,12 @@ irc_account(struct userNode *user, const char *stamp)
     }
 }
 
+void
+irc_fakehost(UNUSED_ARG(struct userNode *user), UNUSED_ARG(const char *host))
+{
+    /* not supported in bahamut */
+}
+
 void
 irc_regnick(struct userNode *user)
 {
@@ -1249,6 +1255,14 @@ mod_chanmode_parse(struct chanNode *channel, char **modes, unsigned int argc, un
         case 'p': do_chan_mode(MODE_PRIVATE); break;
         case 's': do_chan_mode(MODE_SECRET); break;
         case 't': do_chan_mode(MODE_TOPICLIMIT); break;
+       case 'r':
+           if (!(flags & MCP_REGISTERED)) {
+            do_chan_mode(MODE_REGISTERED);
+           } else {
+            mod_chanmode_free(change);
+            return NULL;
+           }
+           break;
 #undef do_chan_mode
         case 'l':
             if (add) {