diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-09-11 23:27:52 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-09-11 23:27:52 +1000 |
| commit | f84be6cd636e0ccb8e146a6d5dbf0f665fea4263 (patch) | |
| tree | 72a39666e6adcef509e84d611409525fadf49280 | |
| parent | 8e48434b9f5140b663c3ca7cb3439b430abf3aac (diff) | |
| parent | 9da49338043dedbf17c99ceed24c2934514d0157 (diff) | |
| download | samba-f84be6cd636e0ccb8e146a6d5dbf0f665fea4263.tar.gz samba-f84be6cd636e0ccb8e146a6d5dbf0f665fea4263.tar.bz2 samba-f84be6cd636e0ccb8e146a6d5dbf0f665fea4263.zip | |
Merge branch 'master' of /home/tridge/samba/git/combined
| -rw-r--r-- | source4/dsdb/repl/drepl_partitions.c | 4 | ||||
| -rw-r--r-- | source4/dsdb/repl/drepl_periodic.c | 3 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 7 | ||||
| -rw-r--r-- | source4/rpc_server/drsuapi/addentry.c | 2 | ||||
| -rw-r--r-- | source4/setup/provision.zone | 2 |
5 files changed, 10 insertions, 8 deletions
diff --git a/source4/dsdb/repl/drepl_partitions.c b/source4/dsdb/repl/drepl_partitions.c index f36b735d32..88c4bbf065 100644 --- a/source4/dsdb/repl/drepl_partitions.c +++ b/source4/dsdb/repl/drepl_partitions.c @@ -33,8 +33,6 @@ #include "librpc/gen_ndr/ndr_drsblobs.h" #include "param/param.h" -static WERROR dreplsrv_refresh_partitions(struct dreplsrv_service *s); - WERROR dreplsrv_load_partitions(struct dreplsrv_service *s) { WERROR status; @@ -256,7 +254,7 @@ static WERROR dreplsrv_refresh_partition(struct dreplsrv_service *s, return WERR_OK; } -static WERROR dreplsrv_refresh_partitions(struct dreplsrv_service *s) +WERROR dreplsrv_refresh_partitions(struct dreplsrv_service *s) { WERROR status; struct dreplsrv_partition *p; diff --git a/source4/dsdb/repl/drepl_periodic.c b/source4/dsdb/repl/drepl_periodic.c index b88d2cee1e..36d5f924be 100644 --- a/source4/dsdb/repl/drepl_periodic.c +++ b/source4/dsdb/repl/drepl_periodic.c @@ -105,5 +105,8 @@ static void dreplsrv_periodic_run(struct dreplsrv_service *service) DEBUG(2,("dreplsrv_periodic_run(): run pending_ops\n")); + /* the KCC might have changed repsFrom */ + dreplsrv_refresh_partitions(service); + dreplsrv_run_pending_ops(service); } diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c index bb446333e2..fbcde764cc 100644 --- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c +++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c @@ -547,9 +547,10 @@ static int replmd_update_rpmd(struct ldb_context *ldb, struct ldb_message *msg, our_invocation_id = samdb_ntds_invocation_id(ldb); if (!our_invocation_id) { - ldb_debug_set(ldb, LDB_DEBUG_ERROR, - __location__ ": replmd_update_rpmd: unable to find invocationId\n"); - return LDB_ERR_OPERATIONS_ERROR; + /* this happens during an initial vampire while + updating the schema */ + DEBUG(5,("No invocationID - skipping replPropertyMetaData update\n")); + return LDB_SUCCESS; } unix_to_nt_time(&now, t); diff --git a/source4/rpc_server/drsuapi/addentry.c b/source4/rpc_server/drsuapi/addentry.c index 4ccf14d93a..ae478027a6 100644 --- a/source4/rpc_server/drsuapi/addentry.c +++ b/source4/rpc_server/drsuapi/addentry.c @@ -103,7 +103,7 @@ static WERROR drsuapi_add_SPNs(struct drsuapi_bind_state *b_state, "E3514235-4B06-11D1-AB04-00C04FC2DCD2/%s/%s", ntds_guid_str, dom_string); el->values[0].length = strlen((char *)el->values[0].data); - el->values[1].data = (uint8_t *)talloc_asprintf(el->values, "ldap/%s/%s", + el->values[1].data = (uint8_t *)talloc_asprintf(el->values, "ldap/%s._msdcs.%s", ntds_guid_str, dom_string); el->values[1].length = strlen((char *)el->values[1].data); diff --git a/source4/setup/provision.zone b/source4/setup/provision.zone index 9e312dcd51..919f8f07c5 100644 --- a/source4/setup/provision.zone +++ b/source4/setup/provision.zone @@ -18,7 +18,7 @@ gc._msdcs IN CNAME ${HOSTNAME} ${NTDSGUID}._msdcs IN CNAME ${HOSTNAME} ; ; global catalog servers -_gc._tcp IN SRV 2 100 3268 ${HOSTNAME} +_gc._tcp IN SRV 0 100 3268 ${HOSTNAME} _gc._tcp.${DEFAULTSITE}._sites IN SRV 0 100 3268 ${HOSTNAME} _ldap._tcp.gc._msdcs IN SRV 0 100 389 ${HOSTNAME} _ldap._tcp.${DEFAULTSITE}._sites.gc._msdcs IN SRV 0 100 389 ${HOSTNAME} |