diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-04-24 11:56:09 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-04-24 11:56:09 +0000 |
| commit | 59e0836b7f4221fd002abab083f71f04dffe7648 (patch) | |
| tree | da660ef946a99ed5fc5a74af265d014b73f2e250 /source3/auth/auth_domain.c | |
| parent | 3f03ecf5627ec0eda7fdbb4314ba804574751ede (diff) | |
| download | samba-59e0836b7f4221fd002abab083f71f04dffe7648.tar.gz samba-59e0836b7f4221fd002abab083f71f04dffe7648.tar.bz2 samba-59e0836b7f4221fd002abab083f71f04dffe7648.zip | |
Merge auth changes from HEAD:
- better error codes than NT_STATUS_UNSUCCESSFUL for domain logon errors
- make auth_winbind load the ntdomain module if winbind isn't there.
- use new trusted domains cache to determine if the domain is valid.
Andrew Bartlett
(This used to be commit ec8d6524c6b0c70927a2b57aab71d9e3a7f8a150)
Diffstat (limited to 'source3/auth/auth_domain.c')
| -rw-r--r-- | source3/auth/auth_domain.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c index e49a41763b..db5f7d82b0 100644 --- a/source3/auth/auth_domain.c +++ b/source3/auth/auth_domain.c @@ -175,6 +175,11 @@ static NTSTATUS connect_to_domain_password_server(struct cli_state **cli, &dest_ip, 0, "IPC$", "IPC", "", "", "",0, retry); if (!NT_STATUS_IS_OK(result)) { + /* map to something more useful */ + if (NT_STATUS_EQUAL(result, NT_STATUS_UNSUCCESSFUL)) { + result = NT_STATUS_NO_LOGON_SERVERS; + } + release_server_mutex(); return result; } @@ -272,7 +277,7 @@ static NTSTATUS find_connect_dc(struct cli_state **cli, struct in_addr dc_ip; fstring srv_name; - if ( !rpc_find_dc(lp_workgroup(), srv_name, &dc_ip) ) { + if (!rpc_find_dc(domain, srv_name, &dc_ip)) { DEBUG(0,("find_connect_dc: Failed to find an DCs for %s\n", lp_workgroup())); return NT_STATUS_NO_LOGON_SERVERS; } |