[SCM] Samba Shared Repository - branch master updated

[Karolin Seeger]

The branch, master has been updated
       via  a6bfc1a... s3-testparm: Throw warning when 'workgroup' and 'netbios name' are identical.
      from  ef6976d... idl: drsuapi.idl - fix few more comments

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit a6bfc1a2d0270197ee34405f3ce028a5919f1aaa
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Mar 24 14:55:15 2010 +0100

    s3-testparm: Throw warning when 'workgroup' and 'netbios name' are identical.
    
    Address bug #7285 (NetBIOS Namespace Clash Handling).
    
    Karolin

-----------------------------------------------------------------------

Summary of changes:
 source3/utils/testparm.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index 3204de2..73e173e 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -77,6 +77,12 @@ cannot be set in the smb.conf file. nmbd will abort with this setting.\n");
 		ret = 1;
 	}
 
+	if (strequal(lp_workgroup(), global_myname())) {
+		fprintf(stderr, "WARNING: 'workgroup' and 'netbios name' " \
+			"must differ.\n");
+		ret = 1;
+	}
+
 	if (!directory_exist_stat(lp_lockdir(), &st)) {
 		fprintf(stderr, "ERROR: lock directory %s does not exist\n",
 		       lp_lockdir());


-- 
Samba Shared Repository