Changeset 142

Timestamp:

Aug 9, 2008, 11:57:47 AM (17 years ago)

Author:

Paul Smedley

Message:

Look for config files in C:\MPTN\ETC\samba

File:

• trunk/samba/source/dynconfig.c (modified) (10 diffs)

trunk/samba/source/dynconfig.c

@@ -75 +75 @@
 DEFINE_DYN_CONFIG_PARAM(BINDIR)
 DEFINE_DYN_CONFIG_PARAM(SWATDIR)
+#ifndef __OS2__
 DEFINE_DYN_CONFIG_PARAM(CONFIGFILE) /**< Location of smb.conf file. **/
 DEFINE_DYN_CONFIG_PARAM(LOGFILEBASE) /** Log file directory. **/
 DEFINE_DYN_CONFIG_PARAM(LMHOSTSFILE) /** Statically configured LanMan hosts. **/
+#endif
 DEFINE_DYN_CONFIG_PARAM(CODEPAGEDIR)
 DEFINE_DYN_CONFIG_PARAM(LIBDIR)
 DEFINE_DYN_CONFIG_PARAM(SHLIBEXT)
+#ifndef __OS2__
 DEFINE_DYN_CONFIG_PARAM(LOCKDIR)
 DEFINE_DYN_CONFIG_PARAM(PIDDIR)
 DEFINE_DYN_CONFIG_PARAM(SMB_PASSWD_FILE)
 DEFINE_DYN_CONFIG_PARAM(PRIVATE_DIR)
-
-#if 0
+#endif
+
+#ifdef __OS2__
 static char *dyn_CONFIGFILE; /**< Location of smb.conf file. **/
 
 const char *get_dyn_CONFIGFILE(void)
 {
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                snprintf(buffer, 260, "%s/samba/smb.conf", getenv("ETC"));
+        }
         if (dyn_CONFIGFILE == NULL) {
-                return CONFIGFILE;
+                
+                return buffer;
         }
         return dyn_CONFIGFILE;
@@ -106 +116 @@
 }
 
+ bool is_default_dyn_CONFIGFILE(void) \
+{\
+        return (dyn_CONFIGFILE == NULL);\
+}
+
 /** Log file directory. **/
 static char *dyn_LOGFILEBASE;
@@ -111 +126 @@
 const char *get_dyn_LOGFILEBASE(void)
 {
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                snprintf(buffer, 260, "%s/samba/log", getenv("ETC"));
+        }
         if (dyn_LOGFILEBASE == NULL) {
-                return LOGFILEBASE;
+                return buffer;
         }
         return dyn_LOGFILEBASE;
@@ -131 +151 @@
 const char *get_dyn_LMHOSTSFILE(void)
 {
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                snprintf(buffer, 260, "%s/samba/lmhosts", getenv("ETC"));
+        }
         if (dyn_LMHOSTSFILE == NULL) {
-                return LMHOSTSFILE;
+                return buffer;
         }
         return dyn_LMHOSTSFILE;
@@ -145 +170 @@
         return dyn_LMHOSTSFILE;
 }
-
+#endif /* __OS2__ */
+
+#if 0
 /**
  * @brief Samba data directory.
@@ -212 +239 @@
         return dyn_SHLIBEXT;
 }
-
+#endif /* #if 0 */
+#ifdef __OS2__
 /**
  * @brief Directory holding lock files.
@@ -223 +251 @@
 const char *get_dyn_LOCKDIR(void)
 {
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                snprintf(buffer, 260, "%s/samba/lock", getenv("ETC"));
+        }
         if (dyn_LOCKDIR == NULL) {
-                return LOCKDIR;
+                return buffer;
         }
         return dyn_LOCKDIR;
@@ -242 +275 @@
 const char *get_dyn_PIDDIR(void)
 {
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                snprintf(buffer, 260, "%s/samba/pid", getenv("ETC"));
+        }
         if (dyn_PIDDIR == NULL) {
-                return PIDDIR;
+                return buffer;
         }
         return dyn_PIDDIR;
@@ -261 +299 @@
 const char *get_dyn_SMB_PASSWD_FILE(void)
 {
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                snprintf(buffer, 260, "%s/samba/private/smbpasswd", getenv("ETC"));
+        }
         if (dyn_SMB_PASSWD_FILE == NULL) {
-                return SMB_PASSWD_FILE;
+                return buffer;
         }
         return dyn_SMB_PASSWD_FILE;
@@ -280 +323 @@
 const char *get_dyn_PRIVATE_DIR(void)
 {
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                snprintf(buffer, 260, "%s/samba/private", getenv("ETC"));
+        }
         if (dyn_PRIVATE_DIR == NULL) {
-                return PRIVATE_DIR;
+                return buffer;
         }
         return dyn_PRIVATE_DIR;