summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2002-03-15 09:24:56 +0000
committerAndrew Tridgell <tridge@samba.org>2002-03-15 09:24:56 +0000
commit6a359cca8eacfc049b1ab9e98778dcf817bb1b42 (patch)
tree02d5d6876c03b360503af43422d300b9ac68a086
parent47731e5b549bc71371b53ca25c576f0c6be25dd1 (diff)
downloadsamba-6a359cca8eacfc049b1ab9e98778dcf817bb1b42.tar.gz
samba-6a359cca8eacfc049b1ab9e98778dcf817bb1b42.tar.bz2
samba-6a359cca8eacfc049b1ab9e98778dcf817bb1b42.zip
the SEC_DOMAIN tests also apply to SEC_ADS
(This used to be commit 775404fe46f72925fb302e149b6f96fab0dbfcb8)
-rw-r--r--source3/utils/testparm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index c8021fef05..78b1f6e504 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -46,7 +46,7 @@ static int do_global_checks(void)
int ret = 0;
SMB_STRUCT_STAT st;
- if (lp_security() == SEC_DOMAIN && !lp_encrypted_passwords()) {
+ if (lp_security() >= SEC_DOMAIN && !lp_encrypted_passwords()) {
printf("ERROR: in 'security=domain' mode the 'encrypt passwords' parameter must also be set to 'true'.\n");
ret = 1;
}
@@ -71,7 +71,7 @@ cannot be set in the smb.conf file. nmbd will abort with this setting.\n");
* Password server sanity checks.
*/
- if((lp_security() == SEC_SERVER || lp_security() == SEC_DOMAIN) && !lp_passwordserver()) {
+ if((lp_security() == SEC_SERVER || lp_security() >= SEC_DOMAIN) && !lp_passwordserver()) {
pstring sec_setting;
if(lp_security() == SEC_SERVER)
pstrcpy(sec_setting, "server");