From 92e97934804758e2fea2e3bd8f9e6630007c8169 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 19 Dec 2004 00:31:31 +0000
Subject: r4268: Merge fix for bugzilla #2150. (This used to be commit
 f00ae4ab0c36a623257861fb65373b39cf075921)

---
 source3/include/includes.h | 9 ---------
 source3/profile/profile.c  | 2 +-
 source3/torture/torture.c  | 2 +-
 3 files changed, 2 insertions(+), 11 deletions(-)

(limited to 'source3')

diff --git a/source3/include/includes.h b/source3/include/includes.h
index ef0f761ff7d..66ff4fa9f02 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 689f67da997..e6d34e68cda 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 91732d69735..72a391dbdbb 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);
-- 
cgit