--- ./Makefile.in Sat Jan 1 20:47:29 2000 +++ ../hybserv-1.6.0beta1/./Makefile.in Wed Aug 22 13:50:32 2001 @@ -20,7 +20,7 @@ VERSION = 1.6.0beta1 CC = @CC@ -CFLAGS = @CFLAGS@ -Wall +CFLAGS = @CFLAGS@ # Debugging CFLAGS #CFLAGS = -g -Wall --- ./include/config.h Mon Jan 3 02:41:35 2000 +++ ../hybserv-1.6.0beta1/./include/config.h Thu Aug 23 11:10:11 2001 @@ -6,7 +6,7 @@ * (HPATH etc) are now defined in settings.conf. */ -#define SETPATH "/usr/local/hybserv/settings.conf" +#define SETPATH "/usr/freeware/lib/ircd/hybserv/settings.conf" /* * Define this to enable NickServ (Nickname Services) @@ -143,7 +143,7 @@ * even lower */ -#define CLIENT_ALLOCATE 256 +#define CLIENT_ALLOCATE 128 /* * Set this to the number of channel structures to allocate at @@ -150,7 +150,7 @@ * one time */ -#define CHANNEL_ALLOCATE 256 +#define CHANNEL_ALLOCATE 128 /* * Set this to the number of server structures to allocate at @@ -269,7 +269,7 @@ * of the "dump" command. */ -#undef ALLOW_DUMP +#define ALLOW_DUMP /* * Define this to allow administrators the use of the "fuckover" --- ./source/Makefile.in Fri Dec 17 21:59:26 1999 +++ ../hybserv-1.6.0beta1/./source/Makefile.in Thu Aug 23 11:23:33 2001 @@ -3,7 +3,7 @@ CC = @CC@ CFLAGS = @CFLAGS@ -LDFLAGS = -L../libString @LDFLAGS@ +LOCALLDFLAGS = -L../libString @LDFLAGS@ INCLUDE = -I../include # DEFS = LIBS = -lString @LIBS@ @LIBP@ @@ -58,7 +58,7 @@ all: $(HYBSERV) $(HYBSERV): $(OBJECTS) $(LIBDEPS) - $(CC) -o $(HYBSERV) $(OBJECTS) $(LDFLAGS) $(LIBS) + $(CC) -o $(HYBSERV) $(OBJECTS) $(LOCALLDFLAGS) $(LIBS) depend: $(MKDEP) $(INCLUDE) $(SOURCES) > $(DEPENDFILE) --- ./source/hybserv.c Mon Dec 13 18:44:28 1999 +++ ../hybserv-1.6.0beta1/./source/hybserv.c Thu Aug 23 21:31:20 2001 @@ -123,7 +123,10 @@ uid = getuid(); /* the user id of the user who ran the process */ euid = geteuid(); /* the effective id (different if setuid) */ - if (!uid || !euid) + /* srosa/SGI we don't care who runs it (probably root from /etc/init.d) + * but we care if it is running AS root so we don't check for (!uid) + */ + if (!euid) { /* * It is setuid root or running as root --- ./source/alloc.c Mon Dec 13 18:41:30 1999 +++ ../hybserv-1.6.0beta1/./source/alloc.c Thu Aug 23 10:59:15 2001 @@ -285,8 +285,8 @@ heapptr->FreeElements--; subptr->FreeElements--; - subptr->LastUsedSlot = (void *) (subptr->first + offset); - return ((void *) (subptr->first + offset)); + subptr->LastUsedSlot = (char *) subptr->first + offset; + return ((char *) subptr->first + offset); } else { @@ -413,7 +413,7 @@ } else { - subptr->LastUsedSlot -= heapptr->ElementSize; + subptr->LastUsedSlot = (char *) subptr->LastUsedSlot - heapptr->ElementSize; /* * If the element right before 'element' was also @@ -426,7 +426,7 @@ #if 0 debug("LAST element [%p] is a NULL, decrementing LastUsedSlot\n", subptr->LastUsedSlot); #endif - subptr->LastUsedSlot -= heapptr->ElementSize; + subptr->LastUsedSlot = (char *) subptr->LastUsedSlot - heapptr->ElementSize; subptr->SlotHoles[index] = (void *) NULL; } #if 0