Changeset 3fbce97 for irc.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:

• irc.c (modified) (4 diffs)

irc.c

@@ -129 +129 @@
         s = set_add(&b->set, "show_offline", "false", set_eval_bw_compat, irc);
         s->flags |= SET_HIDDEN;
+        s = set_add(&b->set, "self_messages", "true", set_eval_self_messages, irc);
         s = set_add(&b->set, "simulate_netsplit", "true", set_eval_bool, irc);
         s = set_add(&b->set, "timezone", "local", set_eval_timezone, irc);
@@ -153 +154 @@
         set_eval_charset(set_find(&b->set, "charset"), set_getstr(&b->set, "charset"));
 
-        irc_write(irc, ":%s NOTICE AUTH :%s", irc->root->host, "BitlBee-IRCd initialized, please go on");
+        irc_write(irc, ":%s NOTICE * :%s", irc->root->host, "BitlBee-IRCd initialized, please go on");
         if (isatty(irc->fd)) {
-                irc_write(irc, ":%s NOTICE AUTH :%s", irc->root->host,
+                irc_write(irc, ":%s NOTICE * :%s", irc->root->host,
                           "If you read this, you most likely accidentally "
                           "started BitlBee in inetd mode on the command line. "
@@ -380 +381 @@
                                                 conv = NULL;
                                         } else {
-                                                irc_write(irc, ":%s NOTICE AUTH :%s", irc->root->host,
+                                                irc_write(irc, ":%s NOTICE * :%s", irc->root->host,
                                                           "Warning: invalid characters received at login time.");
 
@@ -727 +728 @@
 int irc_check_login(irc_t *irc)
 {
-        if (irc->user->user && irc->user->nick) {
+        if (irc->user->user && irc->user->nick && !(irc->status & USTATUS_CAP_PENDING)) {
                 if (global.conf->authmode == AUTHMODE_CLOSED && !(irc->status & USTATUS_AUTHORIZED)) {
                         irc_send_num(irc, 464, ":This server is password-protected.");