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)

diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index 794bc7bb8e73fd8b4a44f83ce42a9a810dd72059..ced3a2009d812c8a8138ccfde161d8ad53e61802 100644 (file)
--- 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 */
   }