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/dynconfig.c | |
| parent | 555941383348f0f740ac169da7b3325f225e9261 (diff) | |
| download | samba-174100c30997e6ae70492528da998e30c1bfce60.tar.gz samba-174100c30997e6ae70492528da998e30c1bfce60.tar.bz2 samba-174100c30997e6ae70492528da998e30c1bfce60.zip | |
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/dynconfig.c')
| -rw-r--r-- | source3/dynconfig.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source3/dynconfig.c b/source3/dynconfig.c index ab0dd48da7..57008ece44 100644 --- a/source3/dynconfig.c +++ b/source3/dynconfig.c @@ -64,6 +64,11 @@ static char *dyn_##name; \ }\ dyn_##name = SMB_STRDUP(newpath);\ return dyn_##name;\ +}\ +\ + bool is_default_dyn_##name(void) \ +{\ + return (dyn_##name == NULL);\ } DEFINE_DYN_CONFIG_PARAM(SBINDIR) |