diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2017-02-20 15:57:03 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2017-03-29 02:37:26 +0200 |
| commit | 5f5756db714de0c1b00d648a48423fde19a564a1 (patch) | |
| tree | beccc6bc5e12fa30514957352770e3c7ca3ccf18 /source4/ldap_server | |
| parent | 7609c57922f1d5041dd65660e157a1ba3bf1a417 (diff) | |
| download | samba-5f5756db714de0c1b00d648a48423fde19a564a1.tar.gz | |
ldap_server: Move code into authenticate_ldap_simple_bind()
This function is only called for simple binds, and by moving the mapping into
the function call we allow the unmapped values to be included in the
user_info and so logged.
We also include the local address and the remote address of the client
for future logging
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Pair-Programmed-by: Gary Lockyer <gary@catalyst.net.nz>
Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Diffstat (limited to 'source4/ldap_server')
| -rw-r--r-- | source4/ldap_server/ldap_bind.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/source4/ldap_server/ldap_bind.c b/source4/ldap_server/ldap_bind.c index e0f13f2de2d..f51765789c6 100644 --- a/source4/ldap_server/ldap_bind.c +++ b/source4/ldap_server/ldap_bind.c @@ -68,7 +68,6 @@ static NTSTATUS ldapsrv_BindSimple(struct ldapsrv_call *call) int result; const char *errstr; - const char *nt4_domain, *nt4_account; struct auth_session_info *session_info; @@ -93,18 +92,15 @@ static NTSTATUS ldapsrv_BindSimple(struct ldapsrv_call *call) goto do_reply; } - status = crack_auto_name_to_nt4_name(call, call->conn->connection->event.ctx, call->conn->lp_ctx, req->dn, &nt4_domain, &nt4_account); - if (NT_STATUS_IS_OK(status)) { - status = authenticate_username_pw(call, - call->conn->connection->event.ctx, - call->conn->connection->msg_ctx, - call->conn->lp_ctx, - nt4_domain, nt4_account, - req->creds.password, - MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT | - MSV1_0_ALLOW_WORKSTATION_TRUST_ACCOUNT, - &session_info); - } + status = authenticate_ldap_simple_bind(call, + call->conn->connection->event.ctx, + call->conn->connection->msg_ctx, + call->conn->lp_ctx, + call->conn->connection->remote_address, + call->conn->connection->local_address, + req->dn, + req->creds.password, + &session_info); if (NT_STATUS_IS_OK(status)) { result = LDAP_SUCCESS; |