summaryrefslogtreecommitdiff
path: root/source3/locking/shmem_sysv.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1998-03-22 01:31:50 +0000
committerAndrew Tridgell <tridge@samba.org>1998-03-22 01:31:50 +0000
commit93b3c5813638d37f53717ec42feff408b8765e23 (patch)
tree01922742a79260410fb9cc8c26296efe8908d87d /source3/locking/shmem_sysv.c
parentbee4067bd4771ee7883ab6365e91df86a1230618 (diff)
downloadsamba-93b3c5813638d37f53717ec42feff408b8765e23.tar.gz
samba-93b3c5813638d37f53717ec42feff408b8765e23.tar.bz2
samba-93b3c5813638d37f53717ec42feff408b8765e23.zip
- added a check for broken RH5 include files. With the standard RH5
includes (ie. unpatched RH5) Samba gets file corruption because of the incorrect definition of the shmid_ds structure. Updating your RH5 installation of glibc-devel fixes this. - don't try to fcntl_lock() a read-only fd in shmem.c - allow level 0 debug messages to get through in smbstatus (This used to be commit 45553771f90087a12db0153524146d42155d1d3f)
Diffstat (limited to 'source3/locking/shmem_sysv.c')
-rw-r--r--source3/locking/shmem_sysv.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/source3/locking/shmem_sysv.c b/source3/locking/shmem_sysv.c
index e415c2ebc5..b9d4594947 100644
--- a/source3/locking/shmem_sysv.c
+++ b/source3/locking/shmem_sysv.c
@@ -542,6 +542,15 @@ struct shmem_ops *sysv_shm_open(int ronly)
int i;
int pid;
+
+
+#ifdef LINUX
+ if (sizeof(shm_ds) == 52) {
+ DEBUG(0,("WARNING: You probably have a broken set of glibc2 include files - disabling sysv shared memory\n"));
+ return NULL;
+ }
+#endif
+
read_only = ronly;
shm_size = lp_shmem_size();