diff options
| author | Volker Lendecke <vlendec@samba.org> | 2005-10-14 21:41:08 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:44:44 -0500 |
| commit | 0aa0c5340fcf01023093a51d2f38df587193c3e3 (patch) | |
| tree | e0bedd86875cd3fb31cf758e56372648d110f7c6 | |
| parent | 207a6bf3976d516e40c1ffa7312243e6ff92c791 (diff) | |
| download | samba-0aa0c5340fcf01023093a51d2f38df587193c3e3.tar.gz samba-0aa0c5340fcf01023093a51d2f38df587193c3e3.tar.bz2 samba-0aa0c5340fcf01023093a51d2f38df587193c3e3.zip | |
r11070: Fix a cut&paste error, now wbinfo can properly separate domain and user...
Volker
(This used to be commit 6e4f774a4948691440362663418243623d1f51f7)
| -rw-r--r-- | source4/winbind/wb_samba3_cmd.c | 12 | ||||
| -rw-r--r-- | source4/winbind/wb_samba3_protocol.c | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/source4/winbind/wb_samba3_cmd.c b/source4/winbind/wb_samba3_cmd.c index 9bd752ace8..339b29c5b0 100644 --- a/source4/winbind/wb_samba3_cmd.c +++ b/source4/winbind/wb_samba3_cmd.c @@ -183,6 +183,7 @@ NTSTATUS wbsrv_samba3_pam_auth(struct wbsrv_samba3_call *s3call) return NT_STATUS_OK; } +#if 0 static BOOL samba3_parse_domuser(TALLOC_CTX *mem_ctx, const char *domuser, char **domain, char **user) { @@ -200,6 +201,7 @@ static BOOL samba3_parse_domuser(TALLOC_CTX *mem_ctx, const char *domuser, return ((*domain != NULL) && (*user != NULL)); } +#endif static void pam_auth_crap_recv(struct composite_context *ctx); @@ -208,7 +210,6 @@ NTSTATUS wbsrv_samba3_pam_auth_crap(struct wbsrv_samba3_call *s3call) struct composite_context *ctx; DATA_BLOB chal, nt_resp, lm_resp; - char *domain, *user; DEBUG(5, ("wbsrv_samba3_pam_auth_crap called\n")); @@ -219,13 +220,10 @@ NTSTATUS wbsrv_samba3_pam_auth_crap(struct wbsrv_samba3_call *s3call) lm_resp.data = s3call->request.data.auth_crap.lm_resp; lm_resp.length = s3call->request.data.auth_crap.lm_resp_len; - if (!samba3_parse_domuser(s3call, s3call->request.data.auth_crap.user, - &domain, &user)) { - return NT_STATUS_NO_MEMORY; - } - ctx = wb_cmd_pam_auth_crap_send( - s3call->call, domain, user, + s3call->call, + s3call->request.data.auth_crap.domain, + s3call->request.data.auth_crap.user, s3call->request.data.auth_crap.workstation, chal, nt_resp, lm_resp); NT_STATUS_HAVE_NO_MEMORY(ctx); diff --git a/source4/winbind/wb_samba3_protocol.c b/source4/winbind/wb_samba3_protocol.c index e99952be96..6e206e32da 100644 --- a/source4/winbind/wb_samba3_protocol.c +++ b/source4/winbind/wb_samba3_protocol.c @@ -80,7 +80,7 @@ NTSTATUS wbsrv_samba3_handle_call(struct wbsrv_call *call) return wbsrv_samba3_ping(s3call); case WINBINDD_INFO: - return wbsrv_samba3_domain_name(s3call); + return wbsrv_samba3_info(s3call); case WINBINDD_DOMAIN_NAME: return wbsrv_samba3_domain_name(s3call); |