summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-12-08 18:08:30 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:29:02 -0500
commit3155ded0481a69b5f8da6704f5076b2a4ee7ee70 (patch)
tree00326786c33b5063af1fd7c2d96d68a0eabdcf0f
parent662ea9f1c7da6ce7ff881b207ab0e1007f093c44 (diff)
downloadsamba-3155ded0481a69b5f8da6704f5076b2a4ee7ee70.tar.gz
samba-3155ded0481a69b5f8da6704f5076b2a4ee7ee70.tar.bz2
samba-3155ded0481a69b5f8da6704f5076b2a4ee7ee70.zip
r20083: move function together which belong to each other
metze (This used to be commit 0c4a7d713da3a96ab1abb3ef65c2fecd110a0549)
-rw-r--r--source4/libnet/libnet_become_dc.c42
1 files changed, 21 insertions, 21 deletions
diff --git a/source4/libnet/libnet_become_dc.c b/source4/libnet/libnet_become_dc.c
index f33dd6efe5..9dfb912b19 100644
--- a/source4/libnet/libnet_become_dc.c
+++ b/source4/libnet/libnet_become_dc.c
@@ -1601,27 +1601,6 @@ DEBUG(0,("start NC[%s] tmp_highest_usn[%llu] highest_usn[%llu]\n",
composite_continue_rpc(c, req, recv_fn, s);
}
-static void becomeDC_drsuapi3_pull_schema_recv(struct rpc_request *req);
-
-static void becomeDC_drsuapi3_pull_schema_send(struct libnet_BecomeDC_state *s)
-{
- s->schema.nc.guid = GUID_zero();
- s->schema.nc.sid = s->zero_sid;
- s->schema.nc.dn = s->forest.schema_dn_str;
-
- s->schema.destination_dsa_guid = s->drsuapi2.bind_guid;
-
- s->schema.replica_flags = DRSUAPI_DS_REPLICA_NEIGHBOUR_WRITEABLE
- | DRSUAPI_DS_REPLICA_NEIGHBOUR_SYNC_ON_STARTUP
- | DRSUAPI_DS_REPLICA_NEIGHBOUR_DO_SCHEDULED_SYNCS
- | DRSUAPI_DS_REPLICA_NEIGHBOUR_FULL_IN_PROGRESS
- | DRSUAPI_DS_REPLICA_NEIGHBOUR_NEVER_SYNCED
- | DRSUAPI_DS_REPLICA_NEIGHBOUR_COMPRESS_CHANGES;
-
- becomeDC_drsuapi_pull_partition_send(s, &s->drsuapi2, &s->drsuapi3, &s->schema,
- becomeDC_drsuapi3_pull_schema_recv);
-}
-
static WERROR becomeDC_drsuapi_pull_partition_recv(struct libnet_BecomeDC_state *s,
struct becomeDC_partition *partition,
struct drsuapi_DsGetNCChanges *r)
@@ -1693,6 +1672,27 @@ DEBUG(0,("end NC[%s] tmp_highest_usn[%llu] highest_usn[%llu]\n",
return WERR_OK;
}
+static void becomeDC_drsuapi3_pull_schema_recv(struct rpc_request *req);
+
+static void becomeDC_drsuapi3_pull_schema_send(struct libnet_BecomeDC_state *s)
+{
+ s->schema.nc.guid = GUID_zero();
+ s->schema.nc.sid = s->zero_sid;
+ s->schema.nc.dn = s->forest.schema_dn_str;
+
+ s->schema.destination_dsa_guid = s->drsuapi2.bind_guid;
+
+ s->schema.replica_flags = DRSUAPI_DS_REPLICA_NEIGHBOUR_WRITEABLE
+ | DRSUAPI_DS_REPLICA_NEIGHBOUR_SYNC_ON_STARTUP
+ | DRSUAPI_DS_REPLICA_NEIGHBOUR_DO_SCHEDULED_SYNCS
+ | DRSUAPI_DS_REPLICA_NEIGHBOUR_FULL_IN_PROGRESS
+ | DRSUAPI_DS_REPLICA_NEIGHBOUR_NEVER_SYNCED
+ | DRSUAPI_DS_REPLICA_NEIGHBOUR_COMPRESS_CHANGES;
+
+ becomeDC_drsuapi_pull_partition_send(s, &s->drsuapi2, &s->drsuapi3, &s->schema,
+ becomeDC_drsuapi3_pull_schema_recv);
+}
+
static void becomeDC_drsuapi3_pull_schema_recv(struct rpc_request *req)
{
struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private,