Removed unixd_set_lock_perms(apr_lock_t *), which is no longer

used by any of the MPMs.  (This is another step toward eliminating
the httpd's dependencies on the old lock API.)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93558 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/os/unix/unixd.c b/os/unix/unixd.c
index 827bac27409f3b20f38dbe73be9eebdc0665551c..6b2f8cebc69244b2acdd8886cda5194f5e3250c3 100644 (file)
--- a/os/unix/unixd.c
+++ b/os/unix/unixd.c
@@ -63,7 +63,6 @@
 #include "http_main.h"
 #include "http_log.h"
 #include "unixd.h"
-#include "apr_lock.h"
 #include "mpm_common.h"
 #include "os.h"
 #include "ap_mpm.h"
@@ -378,38 +377,6 @@ AP_DECLARE(apr_status_t) ap_os_create_privileged_process(
                                               attr, ugid, p);
 }
 
-AP_DECLARE(apr_status_t) unixd_set_lock_perms(apr_lock_t *lock)
-{
-/* MPM shouldn't call us unless we're actually using a SysV sem;
- * this is just to avoid compile issues on systems without that
- * feature
- */
-#if APR_HAS_SYSVSEM_SERIALIZE
-    apr_os_lock_t oslock;
-#if !APR_HAVE_UNION_SEMUN
-    union semun {
-        long val;
-        struct semid_ds *buf;
-        ushort *array;
-    };
-#endif
-    union semun ick;
-    struct semid_ds buf;
-
-    if (!geteuid()) {
-        apr_os_lock_get(&oslock, lock);
-        buf.sem_perm.uid = unixd_config.user_id;
-        buf.sem_perm.gid = unixd_config.group_id;
-        buf.sem_perm.mode = 0600;
-        ick.buf = &buf;
-        if (semctl(oslock.crossproc, 0, IPC_SET, ick) < 0) {
-            return errno;
-        }
-    }
-#endif
-    return APR_SUCCESS;
-}
-
 AP_DECLARE(apr_status_t) unixd_set_proc_mutex_perms(apr_proc_mutex_t *pmutex)
 {
 /* MPM shouldn't call us unless we're actually using a SysV sem;

diff --git a/os/unix/unixd.h b/os/unix/unixd.h
index 21f1f0f3f0e943915b1b5d9db8d706c6f29f7b96..899975b550eb6f09e09d2e7128f08531bf34a49d 100644 (file)
--- a/os/unix/unixd.h
+++ b/os/unix/unixd.h
@@ -70,7 +70,6 @@
 #endif
 #include "apr_hooks.h"
 #include "apr_thread_proc.h"
-#include "apr_lock.h"
 #include "apr_proc_mutex.h"
 
 #include <pwd.h>
@@ -119,7 +118,6 @@ AP_DECLARE(const char *) unixd_set_group(cmd_parms *cmd, void *dummy,
 AP_DECLARE(void) unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit,
                            const char *arg, const char * arg2, int type);
 #endif
-AP_DECLARE(apr_status_t) unixd_set_lock_perms(apr_lock_t *lock);
 AP_DECLARE(apr_status_t) unixd_set_proc_mutex_perms(apr_proc_mutex_t *pmutex);
 AP_DECLARE(apr_status_t) unixd_accept(void **accepted, ap_listen_rec *lr, apr_pool_t *ptrans);