diff options
author | Kai Blin <kai@samba.org> | 2008-02-04 16:16:59 +0100 |
---|---|---|
committer | Kai Blin <kai@samba.org> | 2008-02-04 17:41:23 +0100 |
commit | 174100c30997e6ae70492528da998e30c1bfce60 (patch) | |
tree | 3683845c1fb615aca269b528ef87f86cbd9ebe92 /source3/include/dynconfig.h | |
parent | 555941383348f0f740ac169da7b3325f225e9261 (diff) | |
download | samba-174100c30997e6ae70492528da998e30c1bfce60.tar.gz |
popt: Use SMB_CONF_PATH environment var if no other configfile is set.
Now --configfile (or -s) will have precedence, if that's not given
SMB_CONF_PATH is checked, otherwise the $(CONFIGDIR)/smb.conf default
value is used.
Thanks to Michael for his comments.
(This used to be commit 92a9c6c56fa90aead3b7f4a07bf4f3973ba23555)
Diffstat (limited to 'source3/include/dynconfig.h')
-rw-r--r-- | source3/include/dynconfig.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/source3/include/dynconfig.h b/source3/include/dynconfig.h index bb7e2c20f41..cba71645bdd 100644 --- a/source3/include/dynconfig.h +++ b/source3/include/dynconfig.h @@ -41,42 +41,58 @@ extern char dyn_PRIVATE_DIR[1024]; const char *get_dyn_SBINDIR(void); const char *set_dyn_SBINDIR(const char *newpath); +bool is_default_dyn_SBINDIR(void); const char *get_dyn_BINDIR(void); const char *set_dyn_BINDIR(const char *newpath); +bool is_default_dyn_BINDIR(void); const char *get_dyn_SWATDIR(void); const char *set_dyn_SWATDIR(const char *newpath); +bool is_default_dyn_SWATDIR(void); const char *get_dyn_CONFIGFILE(void); const char *set_dyn_CONFIGFILE(const char *newpath); +bool is_default_dyn_CONFIGFILE(void); const char *get_dyn_dyn_LOGFILEBASE(void); const char *set_dyn_dyn_LOGFILEBASE(const char *newpath); +bool is_default_dyn_LOGFILEBASE(void); const char *get_dyn_LMHOSTSFILE(void); const char *set_dyn_LMHOSTSFILE(const char *newpath); +bool is_default_dyn_LOGFILEBASE(void); const char *get_dyn_CODEPAGEDIR(void); const char *set_dyn_CODEPAGEDIR(const char *newpath); +bool is_default_dyn_CODEPAGEDIR(void); const char *get_dyn_LIBDIR(void); const char *set_dyn_LIBDIR(const char *newpath); +bool is_default_dyn_LIBDIR(void); const char *get_dyn_SHLIBEXT(void); const char *set_dyn_SHLIBEXT(const char *newpath); +bool is_default_dyn_SHLIBEXT(void); const char *get_dyn_LOCKDIR(void); const char *set_dyn_LOCKDIR(const char *newpath); +bool is_default_dyn_LOCKDIR(void); const char *get_dyn_PIDDIR(void); const char *set_dyn_PIDDIR(const char *newpath); +bool is_default_dyn_PIDDIR(void); const char *get_dyn_SMB_PASSWD_FILE(void); const char *set_dyn_SMB_PASSWD_FILE(const char *newpath); +bool is_default_dyn_SMB_PASSWD_FILE(void); const char *get_dyn_PRIVATE_DIR(void); const char *set_dyn_PRIVATE_DIR(const char *newpath); +bool is_default_dyn_PRIVATE_DIR(void); const char *get_dyn_STATEDIR(void); +bool is_default_dyn_STATEDIR(void); + const char *get_dyn_CACHEDIR(void); +bool is_default_dyn_CACHEDIR(bool); |