summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-05-25 09:19:50 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-05-25 05:20:57 +0200
commitee0ee5e925dd19d0c185804f41c40564f441cb39 (patch)
treeb653645e6a59ca77dc4fd555a4cfd75649775149
parent3ba32439c1b3c84f25677f7b1b1eaf092723d24b (diff)
downloadsamba-ee0ee5e925dd19d0c185804f41c40564f441cb39.tar.gz
samba-ee0ee5e925dd19d0c185804f41c40564f441cb39.tar.bz2
samba-ee0ee5e925dd19d0c185804f41c40564f441cb39.zip
s3-testparm Warn about incorrect use of 'password server'
This merges master with v3-6-test Autobuild-User: Andrew Bartlett <abartlet@samba.org> Autobuild-Date: Wed May 25 05:20:57 CEST 2011 on sn-devel-104
-rw-r--r--source3/utils/testparm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index f8b8c7fc9f..aa487718dc 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -139,8 +139,8 @@ cannot be set in the smb.conf file. nmbd will abort with this setting.\n");
else
sec_setting = "";
- fprintf(stderr, "ERROR: The setting 'security=%s' requires the 'password server' parameter be set \
-to the default value * or a valid password server.\n", sec_setting );
+ fprintf(stderr, "ERROR: The setting 'security=%s' requires the 'password server' parameter be set\n"
+ "to the default value * or a valid password server.\n", sec_setting );
ret = 1;
}
@@ -153,7 +153,8 @@ to the default value * or a valid password server.\n", sec_setting );
else
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 );
+ fprintf(stderr, "WARNING: The setting 'security=%s' should NOT be combined with the 'password server' parameter.\n"
+ "(by default Samba will discover the correct DC to contact automatically).\n", sec_setting );
}
/*
@@ -254,7 +255,6 @@ via the %%o substitution. With encrypted passwords this is not possible.\n", lp_
if (!lp_passdb_backend()) {
fprintf(stderr,"ERROR: passdb backend must have a value or be left out\n");
- ret = 1;
}
if (lp_os_level() > 255) {