cvs commit: apache-1.3/src/main http_config.c http_main.c

[coar]

coar00/01/01 09:07:37

  Modified:src  CHANGES
   src/main http_config.c http_main.c
  Log:
Add a way to find out where Apache will be looking for the
suexec binary, since its presence and correct permissions
are all that it takes to enable it.  It's sort-of a module,
so add the report to the '-l' output.
  
  Revision  ChangesPath
  1.1488+3 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1487
  retrieving revision 1.1488
  diff -u -r1.1487 -r1.1488
  --- CHANGES   1999/12/31 05:35:48 1.1487
  +++ CHANGES   2000/01/01 17:07:32 1.1488
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3.10
   
  +  *) Add a suexec status report to the '-l' (compiled-in modules)
  + output. [Ken Coar]
  +
 *) Changes to enable server-parsed mod_autoindex Header and
Readme files. [Raymond S Brand [EMAIL PROTECTED]]
   
  
  
  
  1.149 +6 -1  apache-1.3/src/main/http_config.c
  
  Index: http_config.c
  ===
  RCS file: /home/cvs/apache-1.3/src/main/http_config.c,v
  retrieving revision 1.148
  retrieving revision 1.149
  diff -u -r1.148 -r1.149
  --- http_config.c 1999/10/11 23:05:15 1.148
  +++ http_config.c 2000/01/01 17:07:34 1.149
  @@ -1636,6 +1636,11 @@
   int n;
   
   printf(Compiled-in modules:\n);
  -for (n = 0; ap_loaded_modules[n]; ++n)
  +for (n = 0; ap_loaded_modules[n]; ++n) {
printf(  %s\n, ap_loaded_modules[n]-name);
  +}
  +printf(suexec: %s\n,
  +ap_suexec_enabled
  +? enabled; valid wrapper  SUEXEC_BIN
  +: disabled; invalid wrapper  SUEXEC_BIN);
   }
  
  
  
  1.486 +9 -6  apache-1.3/src/main/http_main.c
  
  Index: http_main.c
  ===
  RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
  retrieving revision 1.485
  retrieving revision 1.486
  diff -u -r1.485 -r1.486
  --- http_main.c   1999/12/10 11:03:33 1.485
  +++ http_main.c   2000/01/01 17:07:34 1.486
  @@ -3158,17 +3158,19 @@
   /* check to see if we have the 'suexec' setuid wrapper installed */
   static int init_suexec(void)
   {
  +int result = 0;
  +
   #ifndef WIN32
   struct stat wrapper;
  -
  -if ((stat(SUEXEC_BIN, wrapper)) != 0)
  - return (ap_suexec_enabled);
   
  -if ((wrapper.st_mode  S_ISUID)  wrapper.st_uid == 0) {
  - ap_suexec_enabled = 1;
  +if ((stat(SUEXEC_BIN, wrapper)) != 0) {
  + result = 0;
  +}
  +else if ((wrapper.st_mode  S_ISUID)  (wrapper.st_uid == 0)) {
  + result = 1;
   }
   #endif /* ndef WIN32 */
  -return (ap_suexec_enabled);
  +return result;
   }
   
   /*
  @@ -4897,6 +4899,7 @@
show_compile_settings();
exit(0);
case 'l':
  + ap_suexec_enabled = init_suexec();
ap_show_modules();
exit(0);
case 'L':
  
  
  

cvs commit: apache-1.3/src/main http_config.c http_main.c

[Ralf S. Engelschall]

rse 98/03/16 04:09:56

  Modified:src/main http_config.c http_main.c
  Log:
  More cosmetics:
  - make -v and -V messages equal in style
  - make usage message readable and avoid line wrapping
  - compress the ``httpd -h'' output a little bit for easier reading
  
  Revision  ChangesPath
  1.106 +1 -2  apache-1.3/src/main/http_config.c
  
  Index: http_config.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/main/http_config.c,v
  retrieving revision 1.105
  retrieving revision 1.106
  diff -u -r1.105 -r1.106
  --- http_config.c 1998/03/13 19:20:13 1.105
  +++ http_config.c 1998/03/16 12:09:52 1.106
  @@ -1520,10 +1520,9 @@
   
   for (n = 0; preloaded_modules[n]; ++n)
for (pc = preloaded_modules[n]-cmds; pc  pc-name; ++pc) {
  - printf(%s\n, pc-name);
  + printf(%s (%s)\n, pc-name, preloaded_modules[n]-name);
if (pc-errmsg)
printf(\t%s\n, pc-errmsg);
  - printf(\t%s\n, preloaded_modules[n]-name);
show_overrides(pc, preloaded_modules[n]);
}
   }
  
  
  
  1.304 +27 -18apache-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.303
  retrieving revision 1.304
  diff -u -r1.303 -r1.304
  --- http_main.c   1998/03/14 02:43:45 1.303
  +++ http_main.c   1998/03/16 12:09:54 1.304
  @@ -777,15 +777,24 @@
   
   void usage(char *bin)
   {
  -fprintf(stderr, Usage: %s [-d directory] [-f file] [-C \directive\] 
[-c \directive\] [-v] [-h] [-l]\n, bin);
  -fprintf(stderr, -d directory : specify an alternate initial 
ServerRoot\n);
  -fprintf(stderr, -f file : specify an alternate ServerConfigFile\n);
  -fprintf(stderr, -C \directive\ : process directive before reading 
config files\n);
  -fprintf(stderr, -c \directive\ : process directive after reading 
config files\n);
  -fprintf(stderr, -v : show version number\n);
  -fprintf(stderr, -V : show compile settings\n);
  -fprintf(stderr, -h : list directives\n);
  -fprintf(stderr, -l : list modules\n);
  +char pad[MAX_STRING_LEN];
  +int i;
  +
  +for (i = 0; i  strlen(bin); i++)
  + pad[i] = ' ';
  +pad[i] = '\0';
  +fprintf(stderr, Usage: %s [-d directory] [-f file]\n, bin);
  +fprintf(stderr,%s [-C \directive\] [-c \directive\]\n, 
pad);
  +fprintf(stderr,%s [-v] [-V] [-h] [-l]\n, pad);
  +fprintf(stderr, Options:\n);
  +fprintf(stderr,   -d directory : specify an alternate initial 
ServerRoot\n);
  +fprintf(stderr,   -f file  : specify an alternate 
ServerConfigFile\n);
  +fprintf(stderr,   -C \directive\   : process directive before reading 
config files\n);
  +fprintf(stderr,   -c \directive\   : process directive after  reading 
config files\n);
  +fprintf(stderr,   -v   : show version number\n);
  +fprintf(stderr,   -V   : show compile settings\n);
  +fprintf(stderr,   -h   : list available configuration 
directives\n);
  +fprintf(stderr,   -l   : list compiled-in modules\n);
   exit(1);
   }
   
  @@ -2867,12 +2876,13 @@
   static void show_compile_settings(void)
   {
   #ifdef SERVER_SUBVERSION
  -printf(Server base version: \%s\\n, SERVER_BASEVERSION);
  -printf(Server sub-version:  \%s\\n, SERVER_SUBVERSION);
  +printf(Server base version: %s\n, SERVER_BASEVERSION);
  +printf(Server sub-version:  %s\n, SERVER_SUBVERSION);
  +printf(Server built:%s\n, apapi_get_server_built());
   #else
  -printf(Server version \%s\\n, apapi_get_server_version());
  +printf(Server version: %s\n, apapi_get_server_version());
  +printf(Server built:   %s\n, apapi_get_server_built());
   #endif
  -printf(Server built:  %s\n, apapi_get_server_built());
   printf(Server's Module Magic Number: %u\n, MODULE_MAGIC_NUMBER);
   printf(Server compiled with\n);
   #ifdef BIG_SECURITY_HOLE
  @@ -2953,7 +2963,6 @@
   #ifdef NEED_HASHBANG_EMUL
   printf( -D NEED_HASHBANG_EMUL\n);
   #endif
  -printf(\n);
   }
   
   
  @@ -3882,8 +3891,8 @@
ap_cpystrn(server_confname, optarg, sizeof(server_confname));
break;
case 'v':
  - printf(Server version %s.\n, apapi_get_server_version());
  - printf(Server built:  %s\n, apapi_get_server_built());
  + printf(Server version: %s\n, apapi_get_server_version());
  + printf(Server built:   %s\n, apapi_get_server_built());
exit(0);
case 'V':
show_compile_settings();
  @@ -4979,8 +4988,8 @@
ap_cpystrn(server_confname, optarg, sizeof(server_confname));
break;
case 'v':
  - printf(Server version %s.\n,