Introduce ap_(get|set)_core_module_config() functions/macros and use them

[apache] / os / unix / unixd.h

diff --git a/os/unix/unixd.h b/os/unix/unixd.h
index c165d15944166c41d573740983dad75f9912f0fa..6b8a79ae32d950cf70a6c77fb8d16512453ba670 100644 (file)
--- a/os/unix/unixd.h
+++ b/os/unix/unixd.h
@@ -77,14 +77,14 @@ typedef struct {
     gid_t group_id;
     int suexec_enabled;
     const char *chroot_dir;
+    const char *suexec_disabled_reason; /* suitable msg if !suexec_enabled */
 } unixd_config_rec;
-AP_DECLARE_DATA extern unixd_config_rec unixd_config;
-
-AP_DECLARE(int) unixd_setup_child(void);  /* mod_cgid needs this */
+AP_DECLARE_DATA extern unixd_config_rec ap_unixd_config;
 
 #if defined(RLIMIT_CPU) || defined(RLIMIT_DATA) || defined(RLIMIT_VMEM) || defined(RLIMIT_NPROC) || defined(RLIMIT_AS)
-AP_DECLARE(void) unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit,
-                           const char *arg, const char * arg2, int type);
+AP_DECLARE(void) ap_unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit,
+                                     const char *arg, 
+                                     const char * arg2, int type);
 #endif
 
 /**
@@ -96,26 +96,18 @@ AP_DECLARE(void) unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit,
  * for SysV semaphores.  Otherwise, it is safe to call it for all
  * mutex types.
  */
-AP_DECLARE(apr_status_t) unixd_set_proc_mutex_perms(apr_proc_mutex_t *pmutex);
-AP_DECLARE(apr_status_t) unixd_set_global_mutex_perms(apr_global_mutex_t *gmutex);
-AP_DECLARE(apr_status_t) unixd_accept(void **accepted, ap_listen_rec *lr, apr_pool_t *ptrans);
+AP_DECLARE(apr_status_t) ap_unixd_set_proc_mutex_perms(apr_proc_mutex_t *pmutex);
+AP_DECLARE(apr_status_t) ap_unixd_set_global_mutex_perms(apr_global_mutex_t *gmutex);
+AP_DECLARE(apr_status_t) ap_unixd_accept(void **accepted, ap_listen_rec *lr, apr_pool_t *ptrans);
 
 #ifdef HAVE_KILLPG
-#define unixd_killpg(x, y)     (killpg ((x), (y)))
+#define ap_unixd_killpg(x, y)  (killpg ((x), (y)))
 #define ap_os_killpg(x, y)      (killpg ((x), (y)))
 #else /* HAVE_KILLPG */
-#define unixd_killpg(x, y)     (kill (-(x), (y)))
+#define ap_unixd_killpg(x, y)  (kill (-(x), (y)))
 #define ap_os_killpg(x, y)      (kill (-(x), (y)))
 #endif /* HAVE_KILLPG */
 
-#define UNIX_DAEMON_COMMANDS   \
-AP_INIT_TAKE1("User", unixd_set_user, NULL, RSRC_CONF, \
-  "Effective user id for this server"), \
-AP_INIT_TAKE1("Group", unixd_set_group, NULL, RSRC_CONF, \
-  "Effective group id for this server"), \
-AP_INIT_TAKE1("ChrootDir", unixd_set_chroot_dir, NULL, RSRC_CONF, \
-    "The directory to chroot(2) into")
-
 #ifdef __cplusplus
 }
 #endif