diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2004-01-06 00:41:13 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2004-01-06 00:41:13 +0000 |
| commit | 06843fdee216a8b40fd44377f520a5c2345b0382 (patch) | |
| tree | 5699b62c7523672d39889c3489a2eb1953f9e02f | |
| parent | 523a4ddd5fb851d86b50238ca4d22b98c2159c50 (diff) | |
| download | samba-06843fdee216a8b40fd44377f520a5c2345b0382.tar.gz samba-06843fdee216a8b40fd44377f520a5c2345b0382.tar.bz2 samba-06843fdee216a8b40fd44377f520a5c2345b0382.zip | |
(merge from 3.0)
Ensure that for wbinfo --set-auth-user, we actually use the domain.
Andrew Bartlett
(This used to be commit 8a63bed29315acb3fe9cc2973426ef8392987c8c)
| -rw-r--r-- | source3/nsswitch/winbindd_cm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/nsswitch/winbindd_cm.c b/source3/nsswitch/winbindd_cm.c index ebf342b355..c255d21102 100644 --- a/source3/nsswitch/winbindd_cm.c +++ b/source3/nsswitch/winbindd_cm.c @@ -181,7 +181,7 @@ static NTSTATUS cm_open_connection(const struct winbindd_domain *domain, const i if (!NT_STATUS_IS_OK(result = cli_session_setup_spnego(new_conn->cli, machine_krb5_principal, machine_password, - domain->name))) { + lp_workgroup()))) { DEBUG(4,("failed kerberos session setup with %s\n", nt_errstr(result))); if (NT_STATUS_IS_OK(result)) result = NT_STATUS_UNSUCCESSFUL; @@ -203,7 +203,7 @@ static NTSTATUS cm_open_connection(const struct winbindd_domain *domain, const i if (!cli_session_setup(new_conn->cli, ipc_username, ipc_password, strlen(ipc_password)+1, ipc_password, strlen(ipc_password)+1, - domain->name)) { + ipc_domain)) { result = cli_nt_error(new_conn->cli); DEBUG(4,("failed authenticated session setup with %s\n", nt_errstr(result))); if (NT_STATUS_IS_OK(result)) |