summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2004-12-19 00:31:31 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:53:41 -0500
commit92e97934804758e2fea2e3bd8f9e6630007c8169 (patch)
tree391be27211b7862a52b5e1a880c03502b95012ac
parent7690459dc66bc56b8bbbfd663781ed0aaeba457e (diff)
downloadsamba-92e97934804758e2fea2e3bd8f9e6630007c8169.tar.gz
samba-92e97934804758e2fea2e3bd8f9e6630007c8169.tar.bz2
samba-92e97934804758e2fea2e3bd8f9e6630007c8169.zip
r4268: Merge fix for bugzilla #2150.
(This used to be commit f00ae4ab0c36a623257861fb65373b39cf075921)
-rw-r--r--source3/include/includes.h9
-rw-r--r--source3/profile/profile.c2
-rw-r--r--source3/torture/torture.c2
3 files changed, 2 insertions, 11 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index ef0f761ff7..66ff4fa9f0 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -1202,15 +1202,6 @@ int vasprintf(char **ptr, const char *format, va_list ap);
#define LOG_DEBUG 7 /* debug-level messages */
#endif
-/* NetBSD doesn't have these */
-#ifndef SHM_R
-#define SHM_R 0400
-#endif
-
-#ifndef SHM_W
-#define SHM_W 0200
-#endif
-
#if HAVE_KERNEL_SHARE_MODES
#ifndef LOCK_MAND
#define LOCK_MAND 32 /* This is a mandatory flock */
diff --git a/source3/profile/profile.c b/source3/profile/profile.c
index 689f67da99..e6d34e68cd 100644
--- a/source3/profile/profile.c
+++ b/source3/profile/profile.c
@@ -22,7 +22,7 @@
#include "includes.h"
#ifdef WITH_PROFILE
-#define IPC_PERMS ((SHM_R | SHM_W) | (SHM_R>>3) | (SHM_R>>6))
+#define IPC_PERMS ((S_IRUSR | S_IWUSR) | S_IRGRP | S_IROTH)
#endif /* WITH_PROFILE */
#ifdef WITH_PROFILE
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 91732d6973..72a391dbdb 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -70,7 +70,7 @@ void *shm_setup(int size)
int shmid;
void *ret;
- shmid = shmget(IPC_PRIVATE, size, SHM_R | SHM_W);
+ shmid = shmget(IPC_PRIVATE, size, S_IRUSR | S_IWUSR);
if (shmid == -1) {
printf("can't get shared memory\n");
exit(1);