git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dcf35ab
)
s4-param: set SMB_CONF_PATH when we load a smb.conf
author
Andrew Tridgell
<tridge@samba.org>
Mon, 19 Apr 2010 07:17:07 +0000
(17:17 +1000)
committer
Andrew Tridgell
<tridge@samba.org>
Mon, 19 Apr 2010 08:21:42 +0000
(18:21 +1000)
this is inherited by child python processes, to ensure they get the
right smb.conf if they don't have one specified. Fixes bug 7301
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
source4/param/loadparm.c
patch
|
blob
|
history
diff --git
a/source4/param/loadparm.c
b/source4/param/loadparm.c
index 2bee0fbd861968456b7fad7d45cab7acc623f1ab..b7dcd9bcee14ec39253f208018b59d5a6685edfd 100644
(file)
--- a/
source4/param/loadparm.c
+++ b/
source4/param/loadparm.c
@@
-2571,6
+2571,12
@@
bool lp_load(struct loadparm_context *lp_ctx, const char *filename)
for a missing smb.conf */
reload_charcnv(lp_ctx);
+ if (bRetval == true) {
+ /* set this up so that any child python tasks will
+ find the right smb.conf */
+ setenv("SMB_CONF_PATH", filename, 1);
+ }
+
return bRetval;
}