diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/auth/auth.c | 6 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 4 | ||||
| -rw-r--r-- | source3/utils/testparm.c | 6 |
3 files changed, 2 insertions, 14 deletions
diff --git a/source3/auth/auth.c b/source3/auth/auth.c index 4b075a6c54..c442a536d8 100644 --- a/source3/auth/auth.c +++ b/source3/auth/auth.c @@ -494,12 +494,6 @@ NTSTATUS make_auth_context_subsystem(TALLOC_CTX *mem_ctx, talloc_tos(), "guest sam winbind:ntdomain", NULL); break; - case SEC_SERVER: - DEBUG(5,("Making default auth method list for security=server\n")); - auth_method_list = str_list_make_v3( - talloc_tos(), "guest sam smbserver", - NULL); - break; case SEC_USER: if (lp_encrypted_passwords()) { if ((lp_server_role() == ROLE_DOMAIN_PDC) || (lp_server_role() == ROLE_DOMAIN_BDC)) { diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 7d82b615e7..a34e5d524b 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -9049,10 +9049,6 @@ static bool lp_load_ex(const char *pszFname, set_allowed_client_auth(); - if (lp_security() == SEC_SERVER) { - DEBUG(1, ("WARNING: The security=server option is deprecated\n")); - } - if (lp_security() == SEC_ADS && strchr(lp_passwordserver(), ':')) { DEBUG(1, ("WARNING: The optional ':port' in password server = %s is deprecated\n", lp_passwordserver())); diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c index 9b224d4c1b..b75fc61b6e 100644 --- a/source3/utils/testparm.c +++ b/source3/utils/testparm.c @@ -129,11 +129,9 @@ 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_DOMAIN) && !*lp_passwordserver()) { const char *sec_setting; - if(lp_security() == SEC_SERVER) - sec_setting = "server"; - else if(lp_security() == SEC_DOMAIN) + if(lp_security() == SEC_DOMAIN) sec_setting = "domain"; else if(lp_security() == SEC_ADS) sec_setting = "ads"; |