summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-05-27 00:16:43 +0000
committerTim Potter <tpot@samba.org>2003-05-27 00:16:43 +0000
commit8bf60dc801b32f7c3ca3cf6572abdaa4bea5bf39 (patch)
treea706977848bca4f36dfcff3f89c64d423927993a /source3
parent2b6e3ec27a23b8e5d523c2797c9e0b7b363b938d (diff)
downloadsamba-8bf60dc801b32f7c3ca3cf6572abdaa4bea5bf39.tar.gz
samba-8bf60dc801b32f7c3ca3cf6572abdaa4bea5bf39.tar.bz2
samba-8bf60dc801b32f7c3ca3cf6572abdaa4bea5bf39.zip
Merge from 3.0: Fix set_local_machine_name() for both *SMBSERVER and
*SMBSERV as per comments in loadparm.c (This used to be commit a6cb33c5bf0e26d8092c06a2cc01a6678109fb68)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/substitute.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c
index ef68bce985..7ba8648156 100644
--- a/source3/lib/substitute.c
+++ b/source3/lib/substitute.c
@@ -40,6 +40,17 @@ void set_local_machine_name(const char* local_name, BOOL perm)
static BOOL already_perm = False;
fstring tmp_local_machine;
+ /*
+ * Windows NT/2k uses "*SMBSERVER" and XP uses "*SMBSERV"
+ * arrggg!!!
+ */
+
+ if (strcasecmp(local_name, "*SMBSERVER")==0)
+ return;
+
+ if (strcasecmp(local_name, "*SMBSERV")==0)
+ return;
+
if (already_perm)
return;