diff options
author | Andrew Bartlett <abartlet@samba.org> | 2008-07-23 16:15:46 +1000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2008-07-23 16:15:46 +1000 |
commit | 9549ebc2ac25320d5a3dfd2aca66ecc39bbf7ae8 (patch) | |
tree | e226831c12ea1ca792cb08dc3eb56a82c3d9fa31 /source4/dsdb/repl | |
parent | d6fdd13dec854c681ad047d104ccfc2bf0ca5de5 (diff) | |
parent | 7fba6c649ba36ca5b76dcfed7b773567c9933077 (diff) | |
download | samba-9549ebc2ac25320d5a3dfd2aca66ecc39bbf7ae8.tar.gz samba-9549ebc2ac25320d5a3dfd2aca66ecc39bbf7ae8.tar.bz2 samba-9549ebc2ac25320d5a3dfd2aca66ecc39bbf7ae8.zip |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 532ccbbe7aa360440f455dfa136f425b9996e998)
Diffstat (limited to 'source4/dsdb/repl')
-rw-r--r-- | source4/dsdb/repl/drepl_out_helpers.c | 2 | ||||
-rw-r--r-- | source4/dsdb/repl/drepl_service.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/dsdb/repl/drepl_out_helpers.c b/source4/dsdb/repl/drepl_out_helpers.c index 281e5691e2..0700867543 100644 --- a/source4/dsdb/repl/drepl_out_helpers.c +++ b/source4/dsdb/repl/drepl_out_helpers.c @@ -142,7 +142,7 @@ static void dreplsrv_out_drsuapi_bind_recv(struct rpc_request *req) info24 = &st->bind_r.out.bind_info->info.info24; st->drsuapi->remote_info28.supported_extensions = info24->supported_extensions; st->drsuapi->remote_info28.site_guid = info24->site_guid; - st->drsuapi->remote_info28.u1 = info24->u1; + st->drsuapi->remote_info28.pid = info24->pid; st->drsuapi->remote_info28.repl_epoch = 0; break; } diff --git a/source4/dsdb/repl/drepl_service.c b/source4/dsdb/repl/drepl_service.c index e485c50a47..3611258ca5 100644 --- a/source4/dsdb/repl/drepl_service.c +++ b/source4/dsdb/repl/drepl_service.c @@ -104,7 +104,7 @@ static WERROR dreplsrv_connect_samdb(struct dreplsrv_service *service, struct lo /* TODO: fill in site_guid */ bind_info28->site_guid = GUID_zero(); /* TODO: find out how this is really triggered! */ - bind_info28->u1 = 0; + bind_info28->pid = 0; bind_info28->repl_epoch = 0; return WERR_OK; |