summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/auth/gensec/gensec.c9
-rw-r--r--source4/auth/gensec/gensec.h1
-rw-r--r--source4/kdc/kpasswdd.c18
3 files changed, 1 insertions, 27 deletions
diff --git a/source4/auth/gensec/gensec.c b/source4/auth/gensec/gensec.c
index 7e6a552ef7..e1680c9c89 100644
--- a/source4/auth/gensec/gensec.c
+++ b/source4/auth/gensec/gensec.c
@@ -1280,15 +1280,6 @@ _PUBLIC_ const struct tsocket_address *gensec_get_remote_address(struct gensec_s
return gensec_security->remote_addr;
}
-_PUBLIC_ NTSTATUS gensec_set_my_addr(struct gensec_security *gensec_security, struct socket_address *my_addr)
-{
- gensec_security->my_addr = my_addr;
- if (my_addr && !talloc_reference(gensec_security, my_addr)) {
- return NT_STATUS_NO_MEMORY;
- }
- return NT_STATUS_OK;
-}
-
_PUBLIC_ NTSTATUS gensec_set_peer_addr(struct gensec_security *gensec_security, struct socket_address *peer_addr)
{
gensec_security->peer_addr = peer_addr;
diff --git a/source4/auth/gensec/gensec.h b/source4/auth/gensec/gensec.h
index 6fed4b6d80..2baf1eabd3 100644
--- a/source4/auth/gensec/gensec.h
+++ b/source4/auth/gensec/gensec.h
@@ -299,7 +299,6 @@ const struct tsocket_address *gensec_get_local_address(struct gensec_security *g
const struct tsocket_address *gensec_get_remote_address(struct gensec_security *gensec_security);
NTSTATUS gensec_set_peer_addr(struct gensec_security *gensec_security, struct socket_address *peer_addr);
-NTSTATUS gensec_set_my_addr(struct gensec_security *gensec_security, struct socket_address *my_addr);
NTSTATUS gensec_start_mech_by_name(struct gensec_security *gensec_security,
const char *name);
diff --git a/source4/kdc/kpasswdd.c b/source4/kdc/kpasswdd.c
index 18adf0a248..586dd1304b 100644
--- a/source4/kdc/kpasswdd.c
+++ b/source4/kdc/kpasswdd.c
@@ -436,9 +436,6 @@ bool kpasswdd_process(struct kdc_server *kdc,
DATA_BLOB kpasswd_req, kpasswd_rep;
struct cli_credentials *server_credentials;
struct gensec_security *gensec_security;
- struct sockaddr_storage ss;
- ssize_t socklen;
- struct socket_address *socket_address;
TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
char *keytab_name;
@@ -534,20 +531,7 @@ bool kpasswdd_process(struct kdc_server *kdc,
}
#endif
- socklen = tsocket_address_bsd_sockaddr(my_addr, (struct sockaddr *) &ss,
- sizeof(struct sockaddr_storage));
- if (socklen < 0) {
- talloc_free(tmp_ctx);
- return false;
- }
- socket_address = socket_address_from_sockaddr(tmp_ctx,
- (struct sockaddr *) &ss, socklen);
- if (socket_address == NULL) {
- talloc_free(tmp_ctx);
- return false;
- }
-
- nt_status = gensec_set_my_addr(gensec_security, socket_address);
+ nt_status = gensec_set_local_address(gensec_security, my_addr);
if (!NT_STATUS_IS_OK(nt_status)) {
talloc_free(tmp_ctx);
return false;