Changeset 3fbce97 for root_commands.c

Timestamp:

2016-09-24T20:14:34Z (8 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ba52ac5

Parents:

63cad66 (diff), 82cb190 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into parson

File:

• root_commands.c (modified) (3 diffs)

root_commands.c

@@ -163 +163 @@
                 irc_umode_set(irc, "+R", 1);
 
+                if (irc->caps & CAP_SASL) {
+                        irc_user_t *iu = irc->user;
+                        irc_send_num(irc, 900, "%s!%s@%s %s :You are now logged in as %s",
+                                iu->nick, iu->user, iu->host, iu->nick, iu->nick);
+                }
+
                 bitlbee_whatsnew(irc);
 
@@ -238 +244 @@
                 irc->status |= USTATUS_IDENTIFIED;
                 irc_umode_set(irc, "+R", 1);
+
+                if (irc->caps & CAP_SASL) {
+                        irc_user_t *iu = irc->user;
+                        irc_send_num(irc, 900, "%s!%s@%s %s :You are now logged in as %s",
+                                iu->nick, iu->user, iu->host, iu->nick, iu->nick);
+                }
 
                 /* Set this var now, or anyone who logs in to his/her
@@ -413 +425 @@
 
                 if (prpl == NULL) {
-                        irc_rootmsg(irc, "Unknown protocol");
+                        if (is_protocol_disabled(cmd[2])) {
+                                irc_rootmsg(irc, "Protocol disabled in global config");
+                        } else {
+                                irc_rootmsg(irc, "Unknown protocol");
+                        }
                         return;
                 }