diff -c -r irc2.8.21+CSr14/include/comstud.h irc2.8.21r15/include/comstud.h *** irc2.8.21+CSr14/include/comstud.h Fri Oct 6 21:23:36 1995 --- irc2.8.21r15/include/comstud.h Sun Nov 12 17:16:42 1995 *************** *** 1,18 **** #ifndef COMSTUD_H #define COMSTUD_H ! /* MAXBUFFERS - make send/receive socket buffers the maximum ! size they can be...#undef this if you notice ! your ircd using way too much mem... */ #define MAXBUFFERS #ifndef MAXBUFFERS ! /* This is the buffer size to use if MAXBUFFER isn't used: */ #define READBUFSIZE 32767 #endif /* DOG3 - define this if you want to use 'leet --- 1,20 ---- #ifndef COMSTUD_H #define COMSTUD_H ! /* MAXBUFFERS - make receive socket buffers the maximum ! size they can be...up to 64K ! NOTE: send buffers will remain at 8K as bad things will happen if ! they are increased! */ #define MAXBUFFERS #ifndef MAXBUFFERS ! /* This is the receive buffer size to use if MAXBUFFER isn't used: */ #define READBUFSIZE 32767 + #endif /* DOG3 - define this if you want to use 'leet *************** *** 192,198 **** want them logged */ ! #define FNAME_FAILED_OPER "/home/irc/irc2.8.21+CSr14/lib/logs/failed.log" /* CLIENT_NOTICES - define this if you wish to see client connecting and exiting notices via /umode +c --- 194,200 ---- want them logged */ ! #define FNAME_FAILED_OPER "/home/irc/irc2.8.21+CSr15/lib/logs/failed.log" /* CLIENT_NOTICES - define this if you wish to see client connecting and exiting notices via /umode +c *************** *** 276,282 **** and you wish to log clones */ ! #define FNAME_CLONELOG "/home/irc/irc2.8.21+CSr14/logs/clones.log" /* DEFAULT_IDLELIMIT - if you have CHECK_IDLE defined above, this value is the default # a client --- 278,284 ---- and you wish to log clones */ ! #define FNAME_CLONELOG "/home/irc/irc2.8.21+CSr15/logs/clones.log" /* DEFAULT_IDLELIMIT - if you have CHECK_IDLE defined above, this value is the default # a client diff -c -r irc2.8.21+CSr14/include/config.h irc2.8.21r15/include/config.h *** irc2.8.21+CSr14/include/config.h Mon Oct 2 15:36:10 1995 --- irc2.8.21r15/include/config.h Sun Nov 12 16:55:16 1995 *************** *** 107,114 **** * these are only the recommened names and paths. Change as needed. * You must define these to something, even if you don't really want them. */ ! #define DPATH "/home/irc/irc2.8.21+CSr14/lib" /* dir where all ircd stuff is */ ! #define SPATH "/home/irc/irc2.8.21+CSr14/lib/ircd" #define CPATH "ircd.conf" /* server configuration file */ #define MPATH "ircd.motd" /* server MOTD file */ #define LPATH "ircd.log" /* Where the debug file lives, if DEBUGMODE */ --- 107,114 ---- * these are only the recommened names and paths. Change as needed. * You must define these to something, even if you don't really want them. */ ! #define DPATH "/home/irc/irc2.8.21+CSr15/lib" /* dir where all ircd stuff is */ ! #define SPATH "/home/irc/irc2.8.21+CSr15/lib/ircd" #define CPATH "ircd.conf" /* server configuration file */ #define MPATH "ircd.motd" /* server MOTD file */ #define LPATH "ircd.log" /* Where the debug file lives, if DEBUGMODE */ *************** *** 122,129 **** * successful use of /oper. These are either full paths or files within DPATH. */ ! #define FNAME_USERLOG "/home/irc/irc2.8.21+CSr14/logs/users.log" /* */ ! #define FNAME_OPERLOG "/home/irc/irc2.8.21+CSr14/logs/opers.log" /* */ /* CHROOTDIR * --- 122,129 ---- * successful use of /oper. These are either full paths or files within DPATH. */ ! #define FNAME_USERLOG "/home/irc/irc2.8.21+CSr15/logs/users.log" /* */ ! #define FNAME_OPERLOG "/home/irc/irc2.8.21+CSr15/logs/opers.log" /* */ /* CHROOTDIR * diff -c -r irc2.8.21+CSr14/include/patchlevel.h irc2.8.21r15/include/patchlevel.h *** irc2.8.21+CSr14/include/patchlevel.h Mon Oct 2 11:57:50 1995 --- irc2.8.21r15/include/patchlevel.h Sun Nov 12 16:55:23 1995 *************** *** 17,21 **** */ #ifndef PATCHLEVEL ! #define PATCHLEVEL "2.8.21+CSr14" #endif --- 17,21 ---- */ #ifndef PATCHLEVEL ! #define PATCHLEVEL "2.8.21+CSr15" #endif diff -c -r irc2.8.21+CSr14/ircd/s_bsd.c irc2.8.21r15/ircd/s_bsd.c *** irc2.8.21+CSr14/ircd/s_bsd.c Fri Oct 6 20:00:17 1995 --- irc2.8.21r15/ircd/s_bsd.c Sun Nov 12 16:54:30 1995 *************** *** 1139,1157 **** opt = 8192; # else #ifdef MAXBUFFERS ! if (sndbufmax==0) { ! int optlen; ! optlen = sizeof(sndbufmax); ! getsockopt(fd, SOL_SOCKET, SO_SNDBUF, (char *) &sndbufmax, ! &optlen); ! while((sndbufmax < 65535) && (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, ! (char *) &sndbufmax, optlen) >= 0)) sndbufmax++; ! getsockopt(fd, SOL_SOCKET, SO_SNDBUF, (char *) &sndbufmax, ! &optlen); ! } ! opt = sndbufmax; #else ! opt = READBUFSIZE; #endif # endif if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &opt, sizeof(opt)) < 0) --- 1139,1147 ---- opt = 8192; # else #ifdef MAXBUFFERS ! opt = rcvbufmax >= 8192 ? 8192 : rcvbufmax; #else ! opt = READBUFSIZE >= 8192 ? 8192 : READBUFSIZE; #endif # endif if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &opt, sizeof(opt)) < 0) diff -c -r irc2.8.21+CSr14/ircd/s_conf.c irc2.8.21r15/ircd/s_conf.c *** irc2.8.21+CSr14/ircd/s_conf.c Sat Sep 30 18:35:06 1995 --- irc2.8.21r15/ircd/s_conf.c Sun Nov 12 16:57:30 1995 *************** *** 129,135 **** sockhost, fullname)); if (index(aconf->name, '@') && *username) { ! (void)strcpy(uhost, username); (void)strcat(uhost, "@"); } else --- 129,135 ---- sockhost, fullname)); if (index(aconf->name, '@') && *username) { ! strncpyzt(uhost, username, USERLEN+1); (void)strcat(uhost, "@"); } else diff -c -r irc2.8.21+CSr14/ircd/s_user.c irc2.8.21r15/ircd/s_user.c *** irc2.8.21+CSr14/ircd/s_user.c Fri Oct 6 20:32:30 1995 --- irc2.8.21r15/ircd/s_user.c Sun Nov 12 17:14:56 1995 *************** *** 380,385 **** --- 380,388 ---- temp = sptr->username; else temp = username; + /* Should we have to call exit_client(), set a "correct" + username -Sol */ + strncpyzt(user->username, temp, USERLEN+1); if ((i = check_client(sptr, temp))) { sendto_ops("%s from %s.", i == -3 ? *************** *** 406,416 **** user->username[USERLEN] = '\0'; #ifdef IDENTD_ONLY ircstp->is_ref++; ! sendto_one(sptr, ":%s NOTICE %s :This server will not allow connections from sites that don't run RFC1413 (pidentd). You may obtain a version for UNIX/VAX/VMX from \"ftp.eskimo.com:/security/pidentd-2.5.1.tar.gz\" via anonymous FTP.", me.name, parv[0]); ! sendto_one(sptr, ":%s NOTICE %s : ", me.name, parv[0]); ! sendto_one(sptr, ":%s NOTICE %s :For Windows, you have two choices. You can obtain WS_IRC+identd from 'ftp.eskimo.com:/security/Windows/wsirc14g.zip' or MIRC from 'ftp.eskimo.com:/security/Windows/mirc30b.zip'. For the Mac, try 'ftp.eskimo.com:/security/Mac/daemon100.sea.hqx'.", me.name, parv[0]); ! sendto_one(sptr, ":%s NOTICE %s : ", me.name, parv[0]); ! sendto_one(sptr, ":%s NOTICE %s :Users may wish to subscribe to a new mailing list 'identd-l'. This list is intended to help users install identd on their Unix, PC, Mac, and other machines.. Send email to majordomo@eskimo.com with the body of the message containing 'subscribe identd-l your@email.address'. Do NOT put anything in the subject line! It will be ignored.", me.name, parv[0]); return exit_client(cptr, sptr, &me, "Install identd"); #endif } --- 409,416 ---- user->username[USERLEN] = '\0'; #ifdef IDENTD_ONLY ircstp->is_ref++; ! sendto_one(sptr, ":%s NOTICE %s :This server will not allow connections from sites that don't run RFC1413 (pidentd).", me.name, parv[0]); ! sendto_one(sptr, ":%s NOTICE %s :Have your system administrator install it if you wish to connect here.", me.name, parv[0]); return exit_client(cptr, sptr, &me, "Install identd"); #endif } *************** *** 539,545 **** lower = upper = special = 0; #ifdef IGNORE_FIRST_CHAR ! tmpstr = (username[1] == '~' ? &username[2] : &username[1]); #else tmpstr = (username[0] == '~' ? &username[1] : username); #endif --- 539,545 ---- lower = upper = special = 0; #ifdef IGNORE_FIRST_CHAR ! tmpstr = (username[0] == '~' ? &username[2] : &username[1]); #else tmpstr = (username[0] == '~' ? &username[1] : username); #endif