summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2005-07-15 11:56:16 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:00:06 -0500
commit63b3898a739c200dddf74950264881ebea5aec54 (patch)
treeec33aded069932f793b0f680f51e9b20b3ae4dd6
parent4fffd271d04fca6e305fda1aba99d88a60fc5271 (diff)
downloadsamba-63b3898a739c200dddf74950264881ebea5aec54.tar.gz
samba-63b3898a739c200dddf74950264881ebea5aec54.tar.bz2
samba-63b3898a739c200dddf74950264881ebea5aec54.zip
r8493: According to MSKB 141714 the %LOGONSERVER% variable should be
substituted like our %L-variable. Guenther (This used to be commit 294fdbccba9835b6abe5f26f22a0a05adb27564e)
-rw-r--r--source3/lib/substitute.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c
index af30e900ac..f25e5468aa 100644
--- a/source3/lib/substitute.c
+++ b/source3/lib/substitute.c
@@ -386,13 +386,18 @@ void standard_sub_basic(const char *smb_name, char *str,size_t len)
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;