s4-gensec: Replace gensec_set_my_addr() with new tsocket based fn.

diff --git a/source4/auth/gensec/gensec.c b/source4/auth/gensec/gensec.c
index 7e6a552ef7aaa152d17832810ad0a8923749f328..e1680c9c894f3e269f101e2d53741a66b28daca7 100644 (file)
--- 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 6fed4b6d802874c2f439a99aacac9ed84eaefc1e..2baf1eabd3f507b1975a3e592515c4859ea3a0b0 100644 (file)
--- 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 18adf0a248774c908cb75b02617c338c88e4e16c..586dd1304b9ec3f0ca49016e0996c5ffead34d61 100644 (file)
--- 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;