[X2serv-cvs] [CVS] Module x3: Change committed
Brought to you by:
sirvulcan
From: Alex S. <ru...@us...> - 2005-05-05 00:15:13
|
Committer : Alex Schumann <ru...@us...> CVSROOT : /cvsroot/x2serv Module : x3 Commit time: 2005-05-05 00:15:06 UTC Modified files: ChangeLog.X3 src/chanserv.c src/nickserv.c Log message: woops :) ---------------------- diff included ---------------------- Index: x3/ChangeLog.X3 diff -u x3/ChangeLog.X3:1.26 x3/ChangeLog.X3:1.27 --- x3/ChangeLog.X3:1.26 Wed May 4 17:03:22 2005 +++ x3/ChangeLog.X3 Wed May 4 17:14:56 2005 @@ -6,6 +6,7 @@ * src/chanserv.c: added an 'adduser pending' feature, where if someone isn't authed x3 will ask them to /auth or register, and then automatically finish adding them to the channel when they do. + Fixed email bug with adduser pending * src/chanserv.h: adduser pending @@ -164,5 +165,5 @@ ***********************************************************************/ -#define CVS_VERSION "$Revision: 1.26 $" +#define CVS_VERSION "$Revision: 1.27 $" Index: x3/src/chanserv.c diff -u x3/src/chanserv.c:1.25 x3/src/chanserv.c:1.26 --- x3/src/chanserv.c:1.25 Wed May 4 16:28:08 2005 +++ x3/src/chanserv.c Wed May 4 17:14:56 2005 @@ -1303,6 +1303,8 @@ process_adduser_pending(struct userNode *user) { struct adduserPending *ap; + if(!user->handle_info) + return; /* not associated with an account */ while((ap = find_adduser_pending(NULL, user))) { struct userData *actee; Index: x3/src/nickserv.c diff -u x3/src/nickserv.c:1.24 x3/src/nickserv.c:1.25 --- x3/src/nickserv.c:1.24 Wed May 4 16:28:10 2005 +++ x3/src/nickserv.c Wed May 4 17:14:56 2005 @@ -1320,6 +1320,8 @@ */ SyncLog("REGISTER %s %s %s %s", hi->handle, syncpass, email_addr ? email_addr : "0", user->info); } + + /* this wont work if email is required .. */ process_adduser_pending(user); return 1; @@ -2057,6 +2059,8 @@ nickserv_eat_cookie(hi->cookie); + process_adduser_pending(user); + return 1; } ----------------------- End of diff ----------------------- |