r21820: move function, so that all are in top-down order as they get called

metze
(This used to be commit 38bb7f5445cf1d1a52a9edb21475ed2d5ed20ce4)

1 files changed, 25 insertions, 23 deletions

diff --git a/source4/libnet/libnet_become_dc.c b/source4/libnet/libnet_become_dc.c
index 28939d94f9..dc1b064eb0 100644
--- a/source4/libnet/libnet_become_dc.c
+++ b/source4/libnet/libnet_become_dc.c
@@ -87,6 +87,31 @@ struct libnet_BecomeDC_state {
 	struct libnet_BecomeDC_Callbacks callbacks;
 };
 
+static void becomeDC_recv_cldap(struct cldap_request *req);
+
+static void becomeDC_send_cldap(struct libnet_BecomeDC_state *s)
+{
+	struct composite_context *c = s->creq;
+	struct cldap_request *req;
+
+	s->cldap.io.in.dest_address	= s->source_dsa.address;
+	s->cldap.io.in.realm		= s->domain.dns_name;
+	s->cldap.io.in.host		= s->dest_dsa.netbios_name;
+	s->cldap.io.in.user		= NULL;
+	s->cldap.io.in.domain_guid	= NULL;
+	s->cldap.io.in.domain_sid	= NULL;
+	s->cldap.io.in.acct_control	= -1;
+	s->cldap.io.in.version		= 6;
+
+	s->cldap.sock = cldap_socket_init(s, s->libnet->event_ctx);
+	if (composite_nomem(s->cldap.sock, c)) return;
+
+	req = cldap_netlogon_send(s->cldap.sock, &s->cldap.io);
+	if (composite_nomem(req, c)) return;
+	req->async.fn		= becomeDC_recv_cldap;
+	req->async.private	= s;
+}
+
 static void becomeDC_connect_ldap1(struct libnet_BecomeDC_state *s);
 
 static void becomeDC_recv_cldap(struct cldap_request *req)
@@ -115,29 +140,6 @@ static void becomeDC_recv_cldap(struct cldap_request *req)
 	becomeDC_connect_ldap1(s);
 }
 
-static void becomeDC_send_cldap(struct libnet_BecomeDC_state *s)
-{
-	struct composite_context *c = s->creq;
-	struct cldap_request *req;
-
-	s->cldap.io.in.dest_address	= s->source_dsa.address;
-	s->cldap.io.in.realm		= s->domain.dns_name;
-	s->cldap.io.in.host		= s->dest_dsa.netbios_name;
-	s->cldap.io.in.user		= NULL;
-	s->cldap.io.in.domain_guid	= NULL;
-	s->cldap.io.in.domain_sid	= NULL;
-	s->cldap.io.in.acct_control	= -1;
-	s->cldap.io.in.version		= 6;
-
-	s->cldap.sock = cldap_socket_init(s, s->libnet->event_ctx);
-	if (composite_nomem(s->cldap.sock, c)) return;
-
-	req = cldap_netlogon_send(s->cldap.sock, &s->cldap.io);
-	if (composite_nomem(req, c)) return;
-	req->async.fn		= becomeDC_recv_cldap;
-	req->async.private	= s;
-}
-
 static NTSTATUS becomeDC_ldap_connect(struct libnet_BecomeDC_state *s, struct becomeDC_ldap *ldap)
 {
 	char *url;