svn commit: samba r8493 - branches/SAMBA_3_0/source/lib trunk/source/lib

[gd at samba.org]

Author: gd
Date: 2005-07-15 11:56:16 +0000 (Fri, 15 Jul 2005)
New Revision: 8493

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8493

Log:
According to MSKB 141714 the %LOGONSERVER% variable should be
substituted like our %L-variable.

Guenther


Modified:
   branches/SAMBA_3_0/source/lib/substitute.c
   trunk/source/lib/substitute.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/substitute.c
===================================================================
--- branches/SAMBA_3_0/source/lib/substitute.c	2005-07-15 11:52:07 UTC (rev 8492)
+++ branches/SAMBA_3_0/source/lib/substitute.c	2005-07-15 11:56:16 UTC (rev 8493)
@@ -386,13 +386,18 @@
 			string_sub(p,"%i", client_socket_addr(),l);
 			break;
 		case 'L' : 
-			if (local_machine_name && *local_machine_name)
+			if (local_machine_name && *local_machine_name) {
+				if (IS_DC)
+					string_sub(p, "\%LOGONSERVER\%", local_machine_name, l);
 				string_sub(p,"%L", local_machine_name,l); 
-			else {
+			} else {
 				pstring temp_name;
 
 				pstrcpy(temp_name, global_myname());
 				strlower_m(temp_name);
+				if (IS_DC)
+					string_sub(p, "\%LOGONSERVER\%", temp_name,l); 
+					
 				string_sub(p,"%L", temp_name,l); 
 			}
 			break;

Modified: trunk/source/lib/substitute.c
===================================================================
--- trunk/source/lib/substitute.c	2005-07-15 11:52:07 UTC (rev 8492)
+++ trunk/source/lib/substitute.c	2005-07-15 11:56:16 UTC (rev 8493)
@@ -386,13 +386,18 @@
 			string_sub(p,"%i", client_socket_addr(),l);
 			break;
 		case 'L' : 
-			if (local_machine_name && *local_machine_name)
+			if (local_machine_name && *local_machine_name) {
+				if (IS_DC)
+					string_sub(p, "\%LOGONSERVER\%", local_machine_name, l);
 				string_sub(p,"%L", local_machine_name,l); 
-			else {
+			} else {
 				pstring temp_name;
 
 				pstrcpy(temp_name, global_myname());
 				strlower_m(temp_name);
+				if (IS_DC)
+					string_sub(p, "\%LOGONSERVER\%", temp_name,l); 
+					
 				string_sub(p,"%L", temp_name,l); 
 			}
 			break;