From 637c3ed4a3a99f37e7c7a7a1015934fae5621d27 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 16 Dec 1997 14:06:09 +0000
Subject: - handle ENOSPC in shmem init. - be a little bit more friendly about
 grabbing semaphores (This used to be commit
 87f88708939a3b72b26716a0d6648c4ea2d14047)

---
 source3/locking/shmem_sysv.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'source3/locking/shmem_sysv.c')

diff --git a/source3/locking/shmem_sysv.c b/source3/locking/shmem_sysv.c
index 826de5694c..665cd8e7b4 100644
--- a/source3/locking/shmem_sysv.c
+++ b/source3/locking/shmem_sysv.c
@@ -557,8 +557,9 @@ struct shmem_ops *sysv_shm_open(int ronly)
 		while (hash_size > 1) {
 			sem_id = semget(SEMAPHORE_KEY, hash_size+1, 
 					IPC_CREAT|IPC_EXCL| SEMAPHORE_PERMS);
-			if (sem_id != -1 || errno != EINVAL) break;
-			hash_size--;
+			if (sem_id != -1 || 
+			    (errno != EINVAL && errno != ENOSPC)) break;
+			hash_size -= 5;
 		}
 
 		if (sem_id == -1) {
@@ -639,8 +640,9 @@ struct shmem_ops *sysv_shm_open(int ronly)
 		while (shm_size > MIN_SHM_SIZE) {
 			shm_id = shmget(SHMEM_KEY, shm_size, 
 					IPC_CREAT | IPC_EXCL | IPC_PERMS);
-			if (shm_id != -1 || errno != EINVAL) break;
-			shm_size *= 0.9;
+			if (shm_id != -1 || 
+			    (errno != EINVAL && errno != ENOSPC)) break;
+			shm_size *= 0.8;
 		}
 		created_new = (shm_id != -1);
 	}
-- 
cgit