[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apache-cvs
Subject:    cvs commit: httpd-2.0 CHANGES
From:       aaron () apache ! org
Date:       2001-11-29 23:34:10
[Download RAW message or body]

aaron       01/11/29 15:34:10

  Modified:    modules/generators mod_suexec.c
               .        CHANGES
  Log:
  Add back in the "suEXEC mechanism enabled (wrapper: /path/to/suexec)"
  message that we had back in apache-1.3 and is still scattered throughout
  our docs.
  
  Unfortunately, when mod_suexec is a DSO we're going to get this thing
  twice in our logs. I believe as a side effect of the load-unload-load
  cycles of our DSOs we're losing the static data segment, which is where
  the "didn't we already report this" flag lives.
  
  Revision  Changes    Path
  1.10      +16 -0     httpd-2.0/modules/generators/mod_suexec.c
  
  Index: mod_suexec.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_suexec.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- mod_suexec.c	2001/02/16 04:26:38	1.9
  +++ mod_suexec.c	2001/11/29 23:34:09	1.10
  @@ -56,9 +56,11 @@
    * University of Illinois, Urbana-Champaign.
    */
   
  +#define CORE_PRIVATE
   #include "httpd.h"
   #include "http_config.h"
   #include "http_core.h"
  +#include "http_log.h"
   #include "http_request.h"
   #include "apr_strings.h"
   #include "unixd.h"
  @@ -125,6 +127,19 @@
       return cfg->active ? &cfg->ugid : NULL;
   }
   
  +static int suexec_post_config(apr_pool_t *p, apr_pool_t *plog,
  +                              apr_pool_t *ptemp, server_rec *s)
  +{
  +    static int reported = 0;
  +    if (!reported && unixd_config.suexec_enabled) {
  +        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, 0, s,
  +                     "suEXEC mechanism enabled (wrapper: %s)", SUEXEC_BIN);
  +        reported = 1;
  +    }
  +
  +    return OK;
  +}
  +
   /*
    * Define the directives specific to this module.  This structure is referenced
    * later by the 'module' structure.
  @@ -141,6 +156,7 @@
   static void suexec_hooks(apr_pool_t *p)
   {
       ap_hook_get_suexec_identity(get_suexec_id_doer,NULL,NULL,APR_HOOK_MIDDLE);
  +    ap_hook_post_config(suexec_post_config,NULL,NULL,APR_HOOK_MIDDLE);
   }
   
   module AP_MODULE_DECLARE_DATA suexec_module =
  
  
  
  1.462     +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.461
  retrieving revision 1.462
  diff -u -r1.461 -r1.462
  --- CHANGES	2001/11/29 06:56:08	1.461
  +++ CHANGES	2001/11/29 23:34:09	1.462
  @@ -1,5 +1,9 @@
   Changes with Apache 2.0.30-dev
   
  +  *) Add back in the "suEXEC mechanism enabled (wrapper: /path/to/suexec)"
  +     message that we had back in apache-1.3 and still have scattered
  +     throughout our docs.  [Aaron Bannert]
  +
     *) Prevent the Win32 port from continuing after encountering an
        error in the command line args to apache.  [William Rowe]
   
  
  
  

[prev in list] [next in list] [prev in thread] [next in thread]