--- bitlbee-0.92/account.c.orig 2005-02-23 18:47:58 +0300 +++ bitlbee-0.92/account.c 2005-03-09 21:27:34 +0300 @@ -137,6 +137,7 @@ void account_on( irc_t *irc, account_t * strncpy( u->username, a->user, sizeof( u->username ) - 1 ); strncpy( u->password, a->pass, sizeof( u->password ) - 1 ); if( a->server) strncpy( u->proto_opt[0], a->server, sizeof( u->proto_opt[0] ) - 1 ); + if( a->ssl) strncpy( u->proto_opt[1], a->ssl, sizeof( u->proto_opt[1] ) - 1 ); a->gc = (struct gaim_connection *) u; /* Bit hackish :-/ */ a->reconnect = 0; --- bitlbee-0.92/account.h.orig 2004-07-10 16:23:35 +0400 +++ bitlbee-0.92/account.h 2005-03-09 21:26:35 +0300 @@ -32,6 +32,7 @@ typedef struct account char *user; char *pass; char *server; + char *ssl; int reconnect; --- bitlbee-0.92/commands.c.orig 2005-02-09 00:48:35 +0300 +++ bitlbee-0.92/commands.c 2005-03-09 21:39:33 +0300 @@ -212,6 +212,8 @@ int cmd_account( irc_t *irc, char **cmd if( cmd[5] ) a->server = g_strdup( cmd[5] ); + if( cmd[6] ) + a->ssl = g_strdup( cmd[6] ); irc_usermsg( irc, "Account successfully added" ); } --- bitlbee-0.92/doc/quickstart.xml.orig 2004-10-07 00:31:11 +0400 +++ bitlbee-0.92/doc/quickstart.xml 2005-03-09 21:52:41 +0300 @@ -29,7 +29,7 @@ When finished, type help quick -To add an account to the account list you will need to use the account add command: account add <protocol> <username> <password> [<server>]. + To add an account to the account list you will need to use the account add command: account add <protocol> <username> <password> [<server>] [<port>] [<ssl>]. @@ -42,7 +42,7 @@ For instance, suppose you have an ICQ ac -Other available IM protocols are jabber, msn, and yahoo. Oscar is the protocol used by ICQ and AOL. For oscar, you need to specify the IM-server as a fourth argument (for jabber, msn and yahoo there is no fourth argument). For AOL Instant Messenger, the server name is login.oscar.aol.com. For ICQ, the server name is login.icq.com. + Other available IM protocols are jabber, msn, and yahoo. Oscar is the protocol used by ICQ and AOL. For oscar, you need to specify the IM-server as a fourth argument (for jabber, msn and yahoo there is no fourth argument). For AOL Instant Messenger, the server name is login.oscar.aol.com. For ICQ, the server name is login.icq.com. For jabber you may specify custom port (if you connect to server with non-standard port) and/or ssl option if you want secure connection. --- bitlbee-0.92/protocols/jabber/jabber.c.orig 2004-11-15 00:37:47 +0300 +++ bitlbee-0.92/protocols/jabber/jabber.c 2005-03-09 21:03:37 +0300 @@ -576,6 +576,11 @@ static void gjab_start(gjconn gjc) if (strstr(user->proto_opt[0], "ssl")) ssl = 1; + /* bit hacky there */ + if (*user->proto_opt[1]) { + if (strstr(user->proto_opt[1], "ssl")) + ssl = 1; + } } if (port == -1 && !ssl) --- bitlbee-0.92/irc.c.orig 2005-02-24 02:32:02 +0300 +++ bitlbee-0.92/irc.c 2005-03-09 23:52:52 +0300 @@ -192,6 +192,7 @@ void irc_free(irc_t * irc) g_free(account->user); g_free(account->pass); g_free(account->server); + g_free(account->ssl); accounttmp = account; account = account->next; g_free(accounttmp); --- bitlbee-0.92/bitlbee.c.orig 2005-02-23 18:48:31 +0300 +++ bitlbee-0.92/bitlbee.c 2005-03-09 23:56:35 +0300 @@ -369,8 +369,8 @@ int bitlbee_save( irc_t *irc ) if( a->protocol == PROTO_OSCAR || a->protocol == PROTO_ICQ || a->protocol == PROTO_TOC ) g_snprintf( s, sizeof( s ), "account add oscar \"%s\" \"%s\" %s", a->user, a->pass, a->server ); else - g_snprintf( s, sizeof( s ), "account add %s \"%s\" \"%s\" \"%s\"", - proto_name[a->protocol], a->user, a->pass, a->server ? a->server : "" ); + g_snprintf( s, sizeof( s ), "account add %s \"%s\" \"%s\" \"%s\" \"%s\"", + proto_name[a->protocol], a->user, a->pass, a->server ? a->server : "", a->ssl ? a->ssl : "" ); line = obfucrypt( irc, s ); if( *line ) --- bitlbee-0.92/doc/commands.xml.orig 2005-02-20 20:29:39 +0300 +++ bitlbee-0.92/doc/commands.xml 2005-03-13 01:11:27 +0300 @@ -16,12 +16,13 @@ - account add <protocol> <username> <password> [<server>] + account add <protocol> <username> <password> [<server>] [<port>] [<ssl>] Adds an account on the given server with the specified protocol, username and password to the account list. Specifying the server is optional and principally only necessary when using oscar. - The following protocols are supported at the moment: jabber, msn, yahoo and oscar (For AIM/ICQ. For AIM use server login.oscar.aol.com, for ICQ use server login.icq.com. For Jabber the server is part of the username (e.g. sjoerd@hemminga-online.nl), it should not be passed in any other way in the command. (E.g.: account add jabber sjoerd@hemminga-online.nl funnypass) For the other protocols you don't have to specify a server.) + The following protocols are supported at the moment: jabber, msn, yahoo and oscar (For AIM/ICQ. For AIM use server login.oscar.aol.com, for ICQ use server login.icq.com. For Jabber the server is part of the username (e.g. sjoerd@hemminga-online.nl), it should not be passed in any other way in the command. (E.g.: account add jabber sjoerd@hemminga-online.nl funnypass) For the other protocols you don't have to specify a server.) For Jabber you may specify custom port (if you connect to server with non-standard port) and/or ssl option if you want secure connection. +