Attachment 161102 Details for Bug 251774 – patch starting to fix the issues being reported

[patch] patch starting to fix the issues being reported

coolkey-1.1.0-file.patch (text/plain), 1.35 KB, created by Steve Grubb on 2007-08-11 01:16:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Grubb

Created: 2007-08-11 01:16:29 UTC

Size: 1.35 KB

patch

obsolete

>diff -urp coolkey-1.1.0.orig/src/coolkey/machdep.cpp coolkey-1.1.0/src/coolkey/machdep.cpp
>--- coolkey-1.1.0.orig/src/coolkey/machdep.cpp	2007-08-10 20:36:54.000000000 -0400
>+++ coolkey-1.1.0/src/coolkey/machdep.cpp	2007-08-10 21:03:49.000000000 -0400
>@@ -248,7 +248,7 @@ SHMem::initSegment(const char *name, int
> 	return NULL;
>     }
>     int mask = umask(0);
>-    int ret = mkdir (MEMSEGPATH, 0777);
>+    int ret = mkdir (MEMSEGPATH, 1777);
>     umask(mask);
>     if ((ret == -1) && (errno != EEXIST)) {
> 	delete shmemData;
>@@ -264,19 +264,19 @@ SHMem::initSegment(const char *name, int
>     shmemData->path[sizeof(MEMSEGPATH)-1] = '/';
>     strcpy(&shmemData->path[sizeof(MEMSEGPATH)],name);
> 
>-    int mode = 0777;
>+    int mode = 0664;
>     if (strcmp(name,"token_names") != 0) {
> 	/* each user gets his own uid array */
>     	sprintf(uid_str, "-%u",getuid());
>     	strcat(shmemData->path,uid_str);
>-	mode = 0700;
>+	mode = 0600;
>     } 
>     shmemData->fd = open(shmemData->path, 
> 		O_CREAT|O_RDWR|O_EXCL|O_APPEND|O_EXLOCK, mode);
>-    if (shmemData->fd  < 0) {
>+    if (shmemData->fd  < 0 && errno == EEXIST) {
> 	needInit = false;
>-	shmemData->fd = open(shmemData->path,O_RDWR|O_EXLOCK, mode);
>-    }  else {
>+	shmemData->fd = open(shmemData->path,O_RDWR|O_EXLOCK|O_NOFOLLOW, mode);
>+    }  else if (shmemData->fd >= 0) {
> 	char *buf;
> 	int len = size+RESERVED_OFFSET;
>

Actions: View | Diff

Attachments on bug 251774: 161102 | 161324