first pass at updating head branch to be to be the same as the SAMBA_2_0 branch

[gd/samba/.git] / source / smbwrapper / shared.c

diff --git a/source/smbwrapper/shared.c b/source/smbwrapper/shared.c
index 3e6e19d9d1674c8003477f6e6801edf63e49f5ba..f7f7b8c8ea931191d4d48ce33ddb04e605455f9f 100644 (file)
--- a/source/smbwrapper/shared.c
+++ b/source/smbwrapper/shared.c
@@ -37,10 +37,10 @@ void smbw_setup_shared(void)
 
        slprintf(s,sizeof(s)-1, "%s/smbw.XXXXXX",tmpdir());
 
-       fstrcpy(name,(char *)mktemp(s));
+       fstrcpy(name,(char *)smbd_mktemp(s));
 
        /* note zero permissions! don't change this */
-       fd = open(name,O_RDWR|O_CREAT|O_TRUNC|O_EXCL,0); 
+       fd = sys_open(name,O_RDWR|O_CREAT|O_TRUNC|O_EXCL,0); 
        if (fd == -1) goto failed;
        unlink(name);
 
@@ -65,6 +65,7 @@ void smbw_setup_shared(void)
        exit(1);
 }
 
+static int locked;
 
 /***************************************************** 
 lock the shared variable area
@@ -79,10 +80,12 @@ static void lockit(void)
                }
                shared_fd = atoi(p);
        }
-       if (fcntl_lock(shared_fd,SMB_F_SETLKW,0,1,F_WRLCK)==False) {
-               DEBUG(0,("ERROR: can't get smbw shared lock\n"));
+       if (locked==0 && 
+           fcntl_lock(shared_fd,SMB_F_SETLKW,0,1,F_WRLCK)==False) {
+               DEBUG(0,("ERROR: can't get smbw shared lock (%s)\n", strerror(errno)));
                exit(1);
        }
+       locked++;
 }
 
 /***************************************************** 
@@ -90,7 +93,10 @@ unlock the shared variable area
 *******************************************************/
 static void unlockit(void)
 {
-       fcntl_lock(shared_fd,SMB_F_SETLK,0,1,F_UNLCK);
+       locked--;
+       if (locked == 0) {
+               fcntl_lock(shared_fd,SMB_F_SETLK,0,1,F_UNLCK);
+       }
 }
 
 
@@ -122,11 +128,14 @@ char *smbw_getshared(const char *name)
        i=0;
        while (i < shared_size) {
                char *n, *v;
+               int l1, l2;
+
+               l1 = SVAL(&variables[i], 0);
+               l2 = SVAL(&variables[i], 2);
 
-               n = &variables[i];
-               i += strlen(n)+1;
-               v = &variables[i];
-               i += strlen(v)+1;
+               n = &variables[i+4];
+               v = &variables[i+4+l1];
+               i += 4+l1+l2;
 
                if (strcmp(name,n)) {
                        continue;
@@ -139,6 +148,7 @@ char *smbw_getshared(const char *name)
  failed:
        DEBUG(0,("smbw: shared variables corrupt (%s)\n", strerror(errno)));
        exit(1);
+       return NULL;
 }
 
 
@@ -148,26 +158,30 @@ set a variable in the shared area
 *******************************************************/
 void smbw_setshared(const char *name, const char *val)
 {
-       int len;
+       int l1, l2;
 
        /* we don't allow variable overwrite */
        if (smbw_getshared(name)) return;
 
        lockit();
 
-       len = strlen(name) + strlen(val) + 2;
+       l1 = strlen(name)+1;
+       l2 = strlen(val)+1;
 
-       variables = (char *)Realloc(variables, shared_size + len);
+       variables = (char *)Realloc(variables, shared_size + l1+l2+4);
 
        if (!variables) {
                DEBUG(0,("out of memory in smbw_setshared\n"));
                exit(1);
        }
 
-       pstrcpy(&variables[shared_size], name);
-       shared_size += strlen(name)+1;
-       pstrcpy(&variables[shared_size], val);
-       shared_size += strlen(val)+1;
+       SSVAL(&variables[shared_size], 0, l1);
+       SSVAL(&variables[shared_size], 2, l2);
+
+       pstrcpy(&variables[shared_size] + 4, name);
+       pstrcpy(&variables[shared_size] + 4 + l1, val);
+
+       shared_size += l1+l2+4;
 
        lseek(shared_fd, 0, SEEK_SET);
        if (write(shared_fd, variables, shared_size) != shared_size) {
@@ -185,9 +199,22 @@ set an env variable - some systems don't have this
 int smbw_setenv(const char *name, const char *value)
 {
        pstring s;
+       char *p;
+       int ret = -1;
 
        slprintf(s,sizeof(s)-1,"%s=%s", name, value);
 
-       return putenv(s);
+       p = strdup(s);
+
+       if (p) ret = putenv(p);
+
+       return ret;
 }
 
+/*****************************************************************
+return true if the passed fd is the SMBW_HANDLE
+*****************************************************************/  
+int smbw_shared_fd(int fd)
+{
+       return (shared_fd && shared_fd == fd);
+}