From: Gabriel B. <sh...@us...> - 2005-12-04 07:14:17
|
Update of /cvsroot/solidircd/solidircd-stable/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30793/include Modified Files: config.h struct.h Log Message: minor updates, currently working on gline implementation. Index: config.h =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/include/config.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** config.h 4 Sep 2005 18:57:33 -0000 1.12 --- config.h 4 Dec 2005 07:14:07 -0000 1.13 *************** *** 131,137 **** /* * STRICT_LIST ! * Define is if you want only registered users & ircops to be able to see ! * the channel list, It is recommend to be defined to prevent spambots from ! * retrieving our channel list. -Sheik 16/04/2005 * */ --- 131,138 ---- /* * STRICT_LIST ! * This function is enabled by default it prevents it prevents unregistered ! * users from viewing channels using /list they're notified to use /qlist instead ! * this helps prevent spambots. ! * -Sheik 16/04/2005 * */ *************** *** 140,148 **** - /* * IRCOP_LIST ! * Define this if you want to enable the /ircops command ! * this command will show all the ircops online. * Added by Sheik on 22/04/2005 * --- 141,149 ---- /* * IRCOP_LIST ! * Define this if you want to enable the /ircops ! * This command will allow users to view the online opers, if ! * an ircop has +H it will not display them on this list. * Added by Sheik on 22/04/2005 * *************** *** 152,164 **** ! /* This option will not allow users to unset themselves +v ! * If you want users to be able to unset +v then undefine this ! * option. * */ ! ! #undef STRICT_HOSTMASK ! /* --- 153,163 ---- ! /* STRICT_HOSTMASK * + * This function prevents users from unsetting +v + * This is used to prevent users from evading bans by unsetting their hostmaks. */ ! #define STRICT_HOSTMASK /* *************** *** 179,184 **** * & NO_USER_STATS only do this if you want normal users to be able to use /stats */ - #define STATS_P_OPERONLY --- 178,183 ---- * & NO_USER_STATS only do this if you want normal users to be able to use /stats */ + #define STATS_P_OPERONLY *************** *** 186,193 **** * Warn +R users that their target will not be able to reply. */ - #define PLUS_R_TO_NONREG_WARN - --- 185,191 ---- * Warn +R users that their target will not be able to reply. */ + #undef PLUS_R_TO_NONREG_WARN *************** *** 200,206 **** * enabled. */ #define HIDEULINEDSERVS 1 ! #undef THROTTLE_ENABLE /* enable throttling, see below */ /* --- 198,205 ---- * enabled. */ + #define HIDEULINEDSERVS 1 ! #undef THROTTLE_ENABLE /* *************** *** 225,229 **** * Enable this at your own risk currently elmer is not working but silly works. - Sheik 1/7/2005 */ ! #define TOYS /* File names --- 224,229 ---- * Enable this at your own risk currently elmer is not working but silly works. - Sheik 1/7/2005 */ ! ! #undef TOYS /* File names *************** *** 378,381 **** --- 378,382 ---- * ignore the first character */ + #define IGNORE_FIRST_CHAR Index: struct.h =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/include/struct.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** struct.h 4 Sep 2005 05:24:13 -0000 1.6 --- struct.h 4 Dec 2005 07:14:07 -0000 1.7 *************** *** 224,233 **** #define FLAGS_HAVERECVQ 0x000040 /* Client has full commands in their recvq */ #define FLAGS_DOINGDNS 0x000080 /* client is waiting for a DNS response */ ! #define FLAGS_AUTH 0x000100 /* client is waiting on rfc931 response */ #define FLAGS_WRAUTH 0x000200 /* set if we havent writen to ident server */ ! #define FLAGS_LOCAL 0x000400 /* set for local clients */ ! #define FLAGS_GOTID 0x000800 /* successful ident lookup achieved */ ! #define FLAGS_DOID 0x001000 /* I-lines say must use ident return */ ! #define FLAGS_NONL 0x002000 /* No \n in buffer */ #define FLAGS_NORMALEX 0x004000 /* Client exited normally */ #define FLAGS_SENDQEX 0x008000 /* Sendq exceeded */ --- 224,233 ---- #define FLAGS_HAVERECVQ 0x000040 /* Client has full commands in their recvq */ #define FLAGS_DOINGDNS 0x000080 /* client is waiting for a DNS response */ ! #define FLAGS_AUTH 0x000100 /* client is waiting on rfc931 response */ #define FLAGS_WRAUTH 0x000200 /* set if we havent writen to ident server */ ! #define FLAGS_LOCAL 0x000400 /* set for local clients */ ! #define FLAGS_GOTID 0x000800 /* successful ident lookup achieved */ ! #define FLAGS_DOID 0x001000 /* I-lines say must use ident return */ ! #define FLAGS_NONL 0x002000 /* No \n in buffer */ #define FLAGS_NORMALEX 0x004000 /* Client exited normally */ #define FLAGS_SENDQEX 0x008000 /* Sendq exceeded */ *************** *** 246,250 **** #define FLAGS_MAP 0x10000000 #define FLAGS_SHUNNED 0x20000000 /* User is shunned */ ! #define FLAGS_GLINED 0x80000000 /* User is shunned */ #ifdef HAVE_SSL #define FLAGS_SSL 0x40000000 /* SSL */ --- 246,250 ---- #define FLAGS_MAP 0x10000000 #define FLAGS_SHUNNED 0x20000000 /* User is shunned */ ! #define FLAGS_GLINED 0x80000000 /* User is glined */ #ifdef HAVE_SSL #define FLAGS_SSL 0x40000000 /* SSL */ *************** *** 259,263 **** #define CAPAB_BURST 0x0010 /* server supports BURST command */ #define CAPAB_UNCONN 0x0020 /* server supports UNCONNECT */ ! #ifdef NOQUIT #define CAPAB_NOQUIT 0x0040 /* noquit support */ #endif --- 259,263 ---- #define CAPAB_BURST 0x0010 /* server supports BURST command */ #define CAPAB_UNCONN 0x0020 /* server supports UNCONNECT */ ! #ifdef NOQUIT #define CAPAB_NOQUIT 0x0040 /* noquit support */ #endif *************** *** 286,298 **** #endif - /* flag macros. */ #define IsULine(x) ((x)->flags & FLAGS_ULINE) - /* User Modes */ - - #define UMODE_a 0x00000001 /* umode +a - Services Admin */ #define UMODE_h 0x00000002 /* umode +h - Helper */ --- 286,294 ---- *************** *** 328,333 **** #define UMODE_R 0x80000000 /* umode +R - No non registered msgs */ - - /* for sendto_ops_lev */ --- 324,327 ---- *************** *** 576,585 **** #define OFLAG_UMODEb 0x00800000 /* Oper can set umode +b : chatops */ #define OFLAG_UMODEF 0x01000000 /* Oper can set umode +F : no flood throttling */ #define OFLAG_LOCAL (OFLAG_REHASH|OFLAG_HELPOP|OFLAG_GLOBOP|OFLAG_WALLOP|\ OFLAG_LOCOP|OFLAG_LROUTE|OFLAG_LKILL|OFLAG_KLINE|\ OFLAG_UNKLINE|OFLAG_LNOTICE|OFLAG_UMODEc|OFLAG_UMODEf|OFLAG_UMODEd|\ OFLAG_UMODEb|OFLAG_UMODEy) ! #define OFLAG_GLOBAL (OFLAG_LOCAL|OFLAG_GROUTE|OFLAG_GKILL|OFLAG_GNOTICE) ! #define OFLAG_ISGLOBAL (OFLAG_GROUTE|OFLAG_GKILL|OFLAG_GNOTICE|OFLAG_SADMIN|OFLAG_UMODEF) #define OPCanZline(x) ((x)->oflag & OFLAG_SADMIN) #define OPCanRehash(x) ((x)->oflag & OFLAG_REHASH) --- 570,583 ---- #define OFLAG_UMODEb 0x00800000 /* Oper can set umode +b : chatops */ #define OFLAG_UMODEF 0x01000000 /* Oper can set umode +F : no flood throttling */ + #define OFLAG_UMODEC 0x02000000 /* Oper can set umode +C : Global connects */ + #define OFLAG_UMODEH 0x04000000 /* Oper can set umode +H : hides their /whois stats */ + #define OFLAG_GLINE 0x08000000 /* Oper can gline */ + #define OFLAG_UNGLINE 0x20000000 /* Oper can Ungline */ #define OFLAG_LOCAL (OFLAG_REHASH|OFLAG_HELPOP|OFLAG_GLOBOP|OFLAG_WALLOP|\ OFLAG_LOCOP|OFLAG_LROUTE|OFLAG_LKILL|OFLAG_KLINE|\ OFLAG_UNKLINE|OFLAG_LNOTICE|OFLAG_UMODEc|OFLAG_UMODEf|OFLAG_UMODEd|\ OFLAG_UMODEb|OFLAG_UMODEy) ! #define OFLAG_GLOBAL (OFLAG_LOCAL|OFLAG_GROUTE|OFLAG_GKILL|OFLAG_GNOTICE|OFLAG_GLINE|OFLAG_UNGLINE) ! #define OFLAG_ISGLOBAL (OFLAG_GROUTE|OFLAG_GKILL|OFLAG_GNOTICE|OFLAG_SADMIN|OFLAG_UMODEF|OFLAG_GLINE|OFLAG_UNGLINE) #define OPCanZline(x) ((x)->oflag & OFLAG_SADMIN) #define OPCanRehash(x) ((x)->oflag & OFLAG_REHASH) *************** *** 596,599 **** --- 594,600 ---- #define OPCanKline(x) ((x)->oflag & OFLAG_KLINE) #define OPCanUnKline(x) ((x)->oflag & OFLAG_UNKLINE) + #define OPCanGline(x) ((x)->oflag & OFLAG_GLINE) + #define OPCanUNGline(x) ((x)->oflag & OFLAG_UNGLINE) + #define OPCanLNotice(x) ((x)->oflag & OFLAG_LNOTICE) #define OPCanGNotice(x) ((x)->oflag & OFLAG_GNOTICE) *************** *** 605,608 **** --- 606,611 ---- #define OPCanUModed(x) ((x)->oflag & OFLAG_UMODEd) #define OPCanUModeb(x) ((x)->oflag & OFLAG_UMODEb) + #define OPCanUModeC(x) ((x)->oflag & OFLAG_UMODEC) + #define OPCanUModeH(x) ((x)->oflag & OFLAG_UMODEH) #define OPCanUModeF(x) ((x)->oflag & OFLAG_UMODEF) #define OPClearRehash(x) ((x)->oflag &= ~OFLAG_REHASH) *************** *** 628,631 **** --- 631,636 ---- #define OPClearUModed(x) ((x)->oflag &= ~OFLAG_UMODEd) #define OPClearUModeb(x) ((x)->oflag &= ~OFLAG_UMODEb) + #define OPClearUModeC(x) ((x)->oflag &= ~OFLAG_UMODEC) + #define OPClearUModeH(x) ((x)->oflag &= ~OFLAG_UMODEH) #define OPClearZLine(x) ((x)->oflag &= ~OFLAG_ZLINE) #define OPClearUModeF(x) ((x)->oflag &= ~OFLAG_UMODEF) |