ben 98/06/07 06:16:43
Modified: src CHANGES src/main http_main.c Log: Make SCO 5 compile again. Revision Changes Path 1.893 +2 -0 apache-1.3/src/CHANGES Index: CHANGES =================================================================== RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.892 retrieving revision 1.893 diff -u -r1.892 -r1.893 --- CHANGES 1998/06/06 20:48:51 1.892 +++ CHANGES 1998/06/07 13:16:40 1.893 @@ -1,5 +1,7 @@ Changes with Apache 1.3.1 + *) PORT: Make SCO 5 (and probably 3) compile again. [Ben Laurie] + *) PORT: NCR MPRAS systems have the same bug with SIGHUP restart that Solaris systems experience. So define WORKAROUND_SOLARIS_BUG. [Klaus Weber <[EMAIL PROTECTED]>] PR#1973 1.361 +10 -10 apache-1.3/src/main/http_main.c Index: http_main.c =================================================================== RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v retrieving revision 1.360 retrieving revision 1.361 diff -u -r1.360 -r1.361 --- http_main.c 1998/06/06 20:48:54 1.360 +++ http_main.c 1998/06/07 13:16:41 1.361 @@ -3242,16 +3242,6 @@ (void) set42sig(); #endif -#ifdef SecureWare - if (set_auth_parameters(argc, argv) < 0) - perror("set_auth_parameters"); - if (getluid() < 0) - if (setluid(getuid()) < 0) - perror("setluid"); - if (setreuid(0, 0) < 0) - perror("setreuid"); -#endif - #ifdef WIN32 /* Initialize the stupid sockets */ AMCSocketInitialize(); @@ -4211,6 +4201,16 @@ int REALMAIN(int argc, char *argv[]) { int c; + +#ifdef SecureWare + if (set_auth_parameters(argc, argv) < 0) + perror("set_auth_parameters"); + if (getluid() < 0) + if (setluid(getuid()) < 0) + perror("setluid"); + if (setreuid(0, 0) < 0) + perror("setreuid"); +#endif #ifdef SOCKS SOCKSinit(argv[0]);