Ensure that for wbinfo --set-auth-user, we actually use the domain.

Andrew Bartlett
(This used to be commit 93a5d8079a0291be14517e437f8f0c964c21e91d)

diff --git a/source3/nsswitch/winbindd_cm.c b/source3/nsswitch/winbindd_cm.c
index bdbf80eb2f062ea9e35662785934c29b14b3d78c..2b561be31db48bb3caf8daba1ab426e87754e80c 100644 (file)
--- a/source3/nsswitch/winbindd_cm.c
+++ b/source3/nsswitch/winbindd_cm.c
@@ -182,7 +182,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)));
                                }
                        }
@@ -202,7 +202,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))