diff options
Diffstat (limited to 'source4/libcli/ldap')
| -rw-r--r-- | source4/libcli/ldap/ldap_client.c | 5 | ||||
| -rw-r--r-- | source4/libcli/ldap/ldap_controls.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source4/libcli/ldap/ldap_client.c b/source4/libcli/ldap/ldap_client.c index d278f407dc..eb53276936 100644 --- a/source4/libcli/ldap/ldap_client.c +++ b/source4/libcli/ldap/ldap_client.c @@ -338,7 +338,9 @@ _PUBLIC_ struct composite_context *ldap_connect_send(struct ldap_connection *con /* LDAPI connections are to localhost, so give the * local host name as the target for gensec's * DIGEST-MD5 mechanism */ - conn->host = talloc_asprintf(conn, "%s.%s", lp_netbios_name(conn->lp_ctx), lp_realm(conn->lp_ctx)); + conn->host = talloc_asprintf(conn, "%s.%s", + lp_netbios_name(conn->lp_ctx), + lp_dnsdomain(conn->lp_ctx)); if (composite_nomem(conn->host, state->ctx)) { return result; } @@ -403,7 +405,6 @@ static void ldap_connect_got_sock(struct composite_context *ctx, talloc_steal(conn, conn->sock); if (conn->ldaps) { struct socket_context *tls_socket; - struct socket_context *tmp_socket; char *cafile = lp_tls_cafile(conn->sock, conn->lp_ctx); if (!cafile || !*cafile) { diff --git a/source4/libcli/ldap/ldap_controls.c b/source4/libcli/ldap/ldap_controls.c index aef775fab5..86493c81da 100644 --- a/source4/libcli/ldap/ldap_controls.c +++ b/source4/libcli/ldap/ldap_controls.c @@ -214,7 +214,7 @@ static bool decode_sd_flags_request(void *mem_ctx, DATA_BLOB in, void *_out) return false; } - if (!asn1_read_Integer(data, &(lsdfc->secinfo_flags))) { + if (!asn1_read_Integer(data, (int *) &(lsdfc->secinfo_flags))) { return false; } @@ -248,7 +248,7 @@ static bool decode_search_options_request(void *mem_ctx, DATA_BLOB in, void *_ou return false; } - if (!asn1_read_Integer(data, &(lsoc->search_options))) { + if (!asn1_read_Integer(data, (int *) &(lsoc->search_options))) { return false; } |