diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2002-03-01 22:45:23 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2002-03-01 22:45:23 +0000 |
| commit | a07e040c8c8515d0ffc2a6cce31a4f0124e42023 (patch) | |
| tree | 36c02f86ed81a628a2f1c905b724f7cee4518232 /source3/auth | |
| parent | c8e924c7a30f53765b9da29fd935f0afe5a54b9f (diff) | |
| download | samba-a07e040c8c8515d0ffc2a6cce31a4f0124e42023.tar.gz samba-a07e040c8c8515d0ffc2a6cce31a4f0124e42023.tar.bz2 samba-a07e040c8c8515d0ffc2a6cce31a4f0124e42023.zip | |
SECURITY FIXES:
Remove a stray 'unbecome_root()' in the ntdomain an auth failure case.
Only allow trust accounts to request a challange in srv_netlogon_nt.c.
Currently any user can be the 'machine' for the domain logon. MERGE for 2.2.
Andrew Bartlett
(This used to be commit 0242d0e17827b05d8cd270f675d2595fa67fd5b9)
Diffstat (limited to 'source3/auth')
| -rw-r--r-- | source3/auth/auth_domain.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c index c7bfea4f6a..6c858e056c 100644 --- a/source3/auth/auth_domain.c +++ b/source3/auth/auth_domain.c @@ -401,14 +401,14 @@ static NTSTATUS check_ntdomain_security(const struct auth_context *auth_context, auth_serversupplied_info **server_info) { NTSTATUS nt_status = NT_STATUS_LOGON_FAILURE; - char *p, *pserver; + char *password_server; unsigned char trust_passwd[16]; time_t last_change_time; char *domain = lp_workgroup(); if (!user_info || !server_info || !auth_context) { DEBUG(1,("check_ntdomain_security: Critical variables not present. Failing.\n")); - return NT_STATUS_LOGON_FAILURE; + return NT_STATUS_INVALID_PARAMETER; } /* @@ -430,7 +430,6 @@ static NTSTATUS check_ntdomain_security(const struct auth_context *auth_context, if (!secrets_fetch_trust_account_password(domain, trust_passwd, &last_change_time)) { DEBUG(0, ("check_domain_security: could not fetch trust account password for domain %s\n", lp_workgroup())); - unbecome_root(); return NT_STATUS_CANT_ACCESS_DOMAIN_INFO; } @@ -445,13 +444,12 @@ static NTSTATUS check_ntdomain_security(const struct auth_context *auth_context, * PDC/BDC. Contact each in turn and try and authenticate. */ - pserver = lp_passwordserver(); - p = pserver; + password_server = lp_passwordserver(); nt_status = domain_client_validate(mem_ctx, user_info, domain, (uchar *)auth_context->challenge.data, server_info, - p, trust_passwd, last_change_time); + password_server, trust_passwd, last_change_time); return nt_status; } |