source: branches/samba-3.3.x/source/dynconfig.c#@ 258

***************
*** 74,97 ****
  DEFINE_DYN_CONFIG_PARAM(SBINDIR)
  DEFINE_DYN_CONFIG_PARAM(BINDIR)
  DEFINE_DYN_CONFIG_PARAM(SWATDIR)
  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. **/
  DEFINE_DYN_CONFIG_PARAM(CODEPAGEDIR)
  DEFINE_DYN_CONFIG_PARAM(LIBDIR)
  DEFINE_DYN_CONFIG_PARAM(SHLIBEXT)
  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
  static char *dyn_CONFIGFILE; /**< Location of smb.conf file. **/
  
  const char *get_dyn_CONFIGFILE(void)
  {
        if (dyn_CONFIGFILE == NULL) {
-               return CONFIGFILE;
        }
        return dyn_CONFIGFILE;
  }
--- 74,107 ----
  DEFINE_DYN_CONFIG_PARAM(SBINDIR)
  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)
+ #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 buffer;
        }
        return dyn_CONFIGFILE;
  }
***************
*** 105,117 ****
        return dyn_CONFIGFILE;
  }
  
  /** Log file directory. **/
  static char *dyn_LOGFILEBASE;
  
  const char *get_dyn_LOGFILEBASE(void)
  {
        if (dyn_LOGFILEBASE == NULL) {
-               return LOGFILEBASE;
        }
        return dyn_LOGFILEBASE;
  }
--- 115,137 ----
        return dyn_CONFIGFILE;
  }
  
+  bool is_default_dyn_CONFIGFILE(void) \
+ {\
+       return (dyn_CONFIGFILE == NULL);\
+ }
+ 
  /** Log file directory. **/
  static char *dyn_LOGFILEBASE;
  
  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 buffer;
        }
        return dyn_LOGFILEBASE;
  }
***************
*** 130,137 ****
  
  const char *get_dyn_LMHOSTSFILE(void)
  {
        if (dyn_LMHOSTSFILE == NULL) {
-               return LMHOSTSFILE;
        }
        return dyn_LMHOSTSFILE;
  }
--- 150,162 ----
  
  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 buffer;
        }
        return dyn_LMHOSTSFILE;
  }
***************
*** 144,150 ****
        dyn_LMHOSTSFILE = SMB_STRDUP(newpath);
        return dyn_LMHOSTSFILE;
  }
  
  /**
   * @brief Samba data directory.
   *
--- 169,177 ----
        dyn_LMHOSTSFILE = SMB_STRDUP(newpath);
        return dyn_LMHOSTSFILE;
  }
+ #endif /* __OS2__ */
  
+ #if 0
  /**
   * @brief Samba data directory.
   *
***************
*** 211,217 ****
        dyn_SHLIBEXT = SMB_STRDUP(newpath);
        return dyn_SHLIBEXT;
  }
- 
  /**
   * @brief Directory holding lock files.
   *
--- 238,245 ----
        dyn_SHLIBEXT = SMB_STRDUP(newpath);
        return dyn_SHLIBEXT;
  }
+ #endif /* #if 0 */
+ #ifdef __OS2__
  /**
   * @brief Directory holding lock files.
   *
***************
*** 222,229 ****
  
  const char *get_dyn_LOCKDIR(void)
  {
        if (dyn_LOCKDIR == NULL) {
-               return LOCKDIR;
        }
        return dyn_LOCKDIR;
  }
--- 250,262 ----
  
  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 buffer;
        }
        return dyn_LOCKDIR;
  }
***************
*** 241,248 ****
  
  const char *get_dyn_PIDDIR(void)
  {
        if (dyn_PIDDIR == NULL) {
-               return PIDDIR;
        }
        return dyn_PIDDIR;
  }
--- 274,286 ----
  
  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 buffer;
        }
        return dyn_PIDDIR;
  }
***************
*** 260,267 ****
  
  const char *get_dyn_SMB_PASSWD_FILE(void)
  {
        if (dyn_SMB_PASSWD_FILE == NULL) {
-               return SMB_PASSWD_FILE;
        }
        return dyn_SMB_PASSWD_FILE;
  }
--- 298,310 ----
  
  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 buffer;
        }
        return dyn_SMB_PASSWD_FILE;
  }
***************
*** 279,286 ****
  
  const char *get_dyn_PRIVATE_DIR(void)
  {
        if (dyn_PRIVATE_DIR == NULL) {
-               return PRIVATE_DIR;
        }
        return dyn_PRIVATE_DIR;
  }
--- 322,334 ----
  
  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 buffer;
        }
        return dyn_PRIVATE_DIR;
  }