mirror of
https://github.com/samba-team/samba.git
synced 2025-01-12 09:18:10 +03:00
r4268: Merge fix for bugzilla #2150.
This commit is contained in:
parent
82b9faaaa2
commit
f00ae4ab0c
@ -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 */
|
||||
|
@ -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
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user