Changeset 252 for branches/samba-3.2.x/source/dynconfig.c

Timestamp:

Jun 5, 2009, 8:30:19 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Fixes for Tickets #74 in 3.2 branch

File:

• branches/samba-3.2.x/source/dynconfig.c (modified) (1 diff)

branches/samba-3.2.x/source/dynconfig.c

@@ -100 +100 @@
                 snprintf(buffer, 260, "%s/samba/smb.conf", getenv("ETC"));
         }
+
+        /* Set UNIXROOT to x:\MPTN if UNIXROOT is undefined */
+        if (getenv("UNIXROOT") == NULL) {
+                static char unixroot[1024] = "";
+                strncpy(unixroot,getenv("ETC"),strlen(getenv("ETC"))-4);
+                setenv("UNIXROOT",unixroot,0);
+        }
+        /* Make sure TMPIR points to a proper value */
+        static char tmpdir[1024] = "";
+        if (getenv("TMPDIR") == NULL && getenv("TEMP") != NULL) {
+                strncpy(tmpdir,getenv("TEMP"),strlen(getenv("TEMP")));
+                setenv("TMPDIR",tmpdir,0);
+        }
+        if (getenv("TMPDIR") == NULL) {
+                strncpy(tmpdir,getenv("ETC"),2);
+                stpcpy(tmpdir,"/OS2/SYSTEM");
+                setenv("TMPDIR",tmpdir,0);
+        }
         if (dyn_CONFIGFILE == NULL) {
-                
-                return buffer;
-        }
+                return buffer;
+        }
+        
         return dyn_CONFIGFILE;
 }