Changeset 5f40da7 for root_commands.c

Timestamp:

2011-12-26T10:51:19Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

199fea6

Parents:

96f954d (diff), 644b808 (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:

Merging oauth-xmpp branch, which adds support for OAuth2 authentication
against some XMPP services (Google Talk, Facebook and Microsoft's MSN-XMPP
gateway).

File:

• root_commands.c (modified) (1 diff)

root_commands.c

@@ -443 +443 @@
                 }
                 
-                irc_rootmsg( irc, "Account successfully added with tag %s%s",
-                             a->tag, cmd[4] ? "" :
-                             ", now use /OPER to enter the password" );
+                irc_rootmsg( irc, "Account successfully added with tag %s", a->tag );
+                
+                if( cmd[4] == NULL )
+                {
+                        set_t *oauth = set_find( &a->set, "oauth" );
+                        if( oauth && bool2int( set_value( oauth ) ) )
+                        {
+                                *a->pass = '\0';
+                                irc_rootmsg( irc, "No need to enter a password for this "
+                                             "account since it's using OAuth" );
+                        }
+                        else
+                        {
+                                irc_rootmsg( irc, "You can now use the /OPER command to "
+                                             "enter the password" );
+                                if( oauth )
+                                        irc_rootmsg( irc, "Alternatively, enable OAuth if "
+                                                     "the account supports it: account %s "
+                                                     "set oauth on", a->tag );
+                        }
+                }
                 
                 return;