[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  1e472f1 s3:testparm: don't return an error for a warning message
      from  7ab9e26 s3-epmapper: Fixed endpoint registration.

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


- Log -----------------------------------------------------------------
commit 1e472f1534985a9e70a2bed45723e08fe8dee078
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri May 20 08:31:16 2011 +0200

    s3:testparm: don't return an error for a warning message
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Fri May 20 13:14:39 CEST 2011 on sn-devel-104

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

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


Changeset truncated at 500 lines:

diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index edb11a6..f8b8c7f 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -154,7 +154,6 @@ to the default value * or a valid password server.\n", sec_setting );
 			sec_setting = "";
 
 		fprintf(stderr, "WARNING: The setting 'security=%s' is should NOT be combined with the 'password server' parameter.\n  (by default Samba will discover the correct DC to contact automatically).\n", sec_setting );
-		ret = 1;
 	}
 
 	/*


-- 
Samba Shared Repository