revret 1533105

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.5.x@1533107 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 10 insertions, 37 deletions

diff --git a/shmem/beos/shm.c b/shmem/beos/shm.c
index d6b888b08..1f06f78ac 100644
--- a/shmem/beos/shm.c
+++ b/shmem/beos/shm.c
@@ -149,8 +149,6 @@ APR_DECLARE(apr_size_t) apr_shm_size_get(const apr_shm_t *m)
     return m->reqsize;
 }
 
-APR_PERMS_SET_ENOTIMPL(shm)
-
 APR_POOL_IMPLEMENT_ACCESSOR(shm)
 
 APR_DECLARE(apr_status_t) apr_os_shm_get(apr_os_shm_t *osshm,
diff --git a/shmem/os2/shm.c b/shmem/os2/shm.c
index dcdb41587..340cae407 100644
--- a/shmem/os2/shm.c
+++ b/shmem/os2/shm.c
@@ -113,8 +113,6 @@ APR_DECLARE(apr_size_t) apr_shm_size_get(const apr_shm_t *m)
     return size;
 }
 
-APR_PERMS_SET_ENOTIMPL(shm)
-
 APR_POOL_IMPLEMENT_ACCESSOR(shm)
 
 APR_DECLARE(apr_status_t) apr_os_shm_get(apr_os_shm_t *osshm,
diff --git a/shmem/unix/shm.c b/shmem/unix/shm.c
index f1259e232..73a729df9 100644
--- a/shmem/unix/shm.c
+++ b/shmem/unix/shm.c
@@ -15,7 +15,6 @@
  */
 
 #include "apr_arch_shm.h"
-#include "apr_arch_file_io.h"
 
 #include "apr_general.h"
 #include "apr_errno.h"
@@ -103,6 +102,7 @@ APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m,
 #endif
 #if APR_USE_SHMEM_SHMGET
     apr_size_t nbytes;
+    key_t shmkey;
 #endif
 #if APR_USE_SHMEM_MMAP_ZERO || APR_USE_SHMEM_SHMGET || \
     APR_USE_SHMEM_MMAP_TMP || APR_USE_SHMEM_MMAP_SHM
@@ -175,8 +175,8 @@ APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m,
         new_m->reqsize = reqsize;
         new_m->realsize = reqsize;
         new_m->filename = NULL;
-        new_m->shmkey = IPC_PRIVATE;
-        if ((new_m->shmid = shmget(new_m->shmkey, new_m->realsize,
+
+        if ((new_m->shmid = shmget(IPC_PRIVATE, new_m->realsize,
                                    SHM_R | SHM_W | IPC_CREAT)) < 0) {
             return errno;
         }
@@ -312,13 +312,13 @@ APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m,
 
         /* ftok() (on solaris at least) requires that the file actually
          * exist before calling ftok(). */
-        new_m->shmkey = ftok(filename, 1);
-        if (new_m->shmkey == (key_t)-1) {
+        shmkey = ftok(filename, 1);
+        if (shmkey == (key_t)-1) {
             apr_file_close(file);
             return errno;
         }
 
-        if ((new_m->shmid = shmget(new_m->shmkey, new_m->realsize,
+        if ((new_m->shmid = shmget(shmkey, new_m->realsize,
                                    SHM_R | SHM_W | IPC_CREAT | IPC_EXCL)) < 0) {
             apr_file_close(file);
             return errno;
@@ -523,6 +523,7 @@ APR_DECLARE(apr_status_t) apr_shm_attach(apr_shm_t **m,
         apr_status_t status;
         apr_file_t *file;   /* file where metadata is stored */
         apr_size_t nbytes;
+        key_t shmkey;
 
         new_m = apr_palloc(pool, sizeof(apr_shm_t));
 
@@ -545,11 +546,11 @@ APR_DECLARE(apr_status_t) apr_shm_attach(apr_shm_t **m,
 
         new_m->filename = apr_pstrdup(pool, filename);
         new_m->pool = pool;
-        new_m->shmkey = ftok(filename, 1);
-        if (new_m->shmkey == (key_t)-1) {
+        shmkey = ftok(filename, 1);
+        if (shmkey == (key_t)-1) {
             return errno;
         }
-        if ((new_m->shmid = shmget(new_m->shmkey, 0, SHM_R | SHM_W)) == -1) {
+        if ((new_m->shmid = shmget(shmkey, 0, SHM_R | SHM_W)) == -1) {
             return errno;
         }
         if ((new_m->base = shmat(new_m->shmid, NULL, 0)) == (void *)-1) {
@@ -586,28 +587,6 @@ APR_DECLARE(apr_size_t) apr_shm_size_get(const apr_shm_t *m)
     return m->reqsize;
 }
 
-APR_PERMS_SET_IMPLEMENT(shm)
-{
-#if APR_USE_SHMEM_SHMGET || APR_USE_SHMEM_SHMGET_ANON
-    struct shmid_ds shmbuf;
-    int shmid;
-    apr_shm_t *m = (apr_shm_t *)theshm;
-
-    if ((shmid = shmget(m->shmkey, 0, SHM_R | SHM_W)) == -1) {
-        return errno;
-    }
-    shmbuf.shm_perm.uid  = uid;
-    shmbuf.shm_perm.gid  = gid;
-    shmbuf.shm_perm.mode = apr_unix_perms2mode(perms);
-    if (shmctl(shmid, IPC_SET, &shmbuf) == -1) {
-        return errno;
-    }
-    return APR_SUCCESS;
-#else
-    return APR_ENOTIMPL;
-#endif
-}
-
 APR_POOL_IMPLEMENT_ACCESSOR(shm)
 
 APR_DECLARE(apr_status_t) apr_os_shm_get(apr_os_shm_t *osshm,
diff --git a/shmem/win32/shm.c b/shmem/win32/shm.c
index 117e4c81f..85926ab7e 100644
--- a/shmem/win32/shm.c
+++ b/shmem/win32/shm.c
@@ -281,8 +281,6 @@ APR_DECLARE(apr_size_t) apr_shm_size_get(const apr_shm_t *m)
     return m->length;
 }
 
-APR_PERMS_SET_ENOTIMPL(shm)
-
 APR_POOL_IMPLEMENT_ACCESSOR(shm)
 
 APR_DECLARE(apr_status_t) apr_os_shm_get(apr_os_shm_t *osshm,