diff options
| author | John Terpstra <jht@samba.org> | 1997-09-17 13:53:59 +0000 |
|---|---|---|
| committer | John Terpstra <jht@samba.org> | 1997-09-17 13:53:59 +0000 |
| commit | a8064b0f00f78d04d7e1969ebfbd01fbc55943c6 (patch) | |
| tree | 1e531e6ede3afa9386149830bf3227d4837cece0 | |
| parent | 99517574ca6ac81cff1061cab46a1a466dc989c9 (diff) | |
| download | samba-a8064b0f00f78d04d7e1969ebfbd01fbc55943c6.tar.gz samba-a8064b0f00f78d04d7e1969ebfbd01fbc55943c6.tar.bz2 samba-a8064b0f00f78d04d7e1969ebfbd01fbc55943c6.zip | |
JHT ===> Changed behaviour of logon script processing so that all macros
can be used in the logon script parameter definition in the smb.conf
Globals section. This fixes a problem reported by Jacco de Leeuw
where OS/2 does not see the %u variable. Jacco suggested using %U
but we really do want the user for the netlogon share session.
If this does not do the trick - well we eat our hat! Yeh!
(This used to be commit a7716b2e70606e447094509116455ea53fe8bf64)
| -rw-r--r-- | source3/smbd/ipc.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c index 794bc7bb8e..ced3a2009d 100644 --- a/source3/smbd/ipc.c +++ b/source3/smbd/ipc.c @@ -2219,6 +2219,7 @@ static BOOL api_WWkstaUserLogon(int cnum,uint16 vuid, char *param,char *data, int uLevel; struct pack_desc desc; char* name; + char* logon_script; uLevel = SVAL(p,0); name = p + 2; @@ -2261,7 +2262,14 @@ static BOOL api_WWkstaUserLogon(int cnum,uint16 vuid, char *param,char *data, PACKS(&desc,"z",mypath); /* computer */ } PACKS(&desc,"z",myworkgroup);/* domain */ - PACKS(&desc,"z",lp_logon_script()); /* script path */ + +/* JHT - By calling lp_logon_script() and standard_sub() we have */ +/* made sure all macros are fully substituted and available */ + logon_script = lp_logon_script(); + standard_sub( cnum, logon_script ); + PACKS(&desc,"z", logon_script); /* script path */ +/* End of JHT mods */ + PACKI(&desc,"D",0x00000000); /* reserved */ } |