svn commit: samba r4268 - in branches/SAMBA_3_0/source: include profile torture

[tpot at samba.org]

Author: tpot
Date: 2004-12-19 00:31:31 +0000 (Sun, 19 Dec 2004)
New Revision: 4268

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4268

Log:
Merge fix for bugzilla #2150.

Modified:
   branches/SAMBA_3_0/source/include/includes.h
   branches/SAMBA_3_0/source/profile/profile.c
   branches/SAMBA_3_0/source/torture/torture.c


Changeset:
Modified: branches/SAMBA_3_0/source/include/includes.h
===================================================================
--- branches/SAMBA_3_0/source/include/includes.h	2004-12-19 00:13:24 UTC (rev 4267)
+++ branches/SAMBA_3_0/source/include/includes.h	2004-12-19 00:31:31 UTC (rev 4268)
@@ -1202,15 +1202,6 @@
 #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 */

Modified: branches/SAMBA_3_0/source/profile/profile.c
===================================================================
--- branches/SAMBA_3_0/source/profile/profile.c	2004-12-19 00:13:24 UTC (rev 4267)
+++ branches/SAMBA_3_0/source/profile/profile.c	2004-12-19 00:31:31 UTC (rev 4268)
@@ -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

Modified: branches/SAMBA_3_0/source/torture/torture.c
===================================================================
--- branches/SAMBA_3_0/source/torture/torture.c	2004-12-19 00:13:24 UTC (rev 4267)
+++ branches/SAMBA_3_0/source/torture/torture.c	2004-12-19 00:31:31 UTC (rev 4268)
@@ -70,7 +70,7 @@
 	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);