[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-206-g9da4933

[Andrew Tridgell]

The branch, master has been updated
       via  9da49338043dedbf17c99ceed24c2934514d0157 (commit)
       via  97182d52dfff8ceca797a5c96122bf94731e79f0 (commit)
       via  e4683bfb3b34eb4b0e9eecc5136d6bca9ce39369 (commit)
       via  bd7cf6988e0b63537d21735acbb79179bfb5bd8f (commit)
      from  bca75ecf9797df98a998eeb0b978cd2fe71ed2cb (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 9da49338043dedbf17c99ceed24c2934514d0157
Author: Andrew Tridgell <tridge at samba.org>
Date:   Fri Sep 11 23:26:39 2009 +1000

    s4-vampire: cope with no invocationID when vampiring the schema

commit 97182d52dfff8ceca797a5c96122bf94731e79f0
Author: Andrew Tridgell <tridge at samba.org>
Date:   Fri Sep 11 23:14:07 2009 +1000

    s4-drs: fixed the ldap SPN in AddEntry

commit e4683bfb3b34eb4b0e9eecc5136d6bca9ce39369
Author: Andrew Tridgell <tridge at samba.org>
Date:   Fri Sep 11 23:13:39 2009 +1000

    s4-provision: revert _gc_tcp priority
    
    thanks to id10ts for spotting this. I was a victim of emacs zone mode,
    which increaed it with each edit.

commit bd7cf6988e0b63537d21735acbb79179bfb5bd8f
Author: Andrew Tridgell <tridge at samba.org>
Date:   Fri Sep 11 22:47:11 2009 +1000

    s4-repl: refresh the partitions on each cycle
    
    The KCC might have changed repsFrom, which is stored in the partitions
    structure

-----------------------------------------------------------------------

Summary of changes:
 source4/dsdb/repl/drepl_partitions.c            |    4 +---
 source4/dsdb/repl/drepl_periodic.c              |    3 +++
 source4/dsdb/samdb/ldb_modules/repl_meta_data.c |    7 ++++---
 source4/rpc_server/drsuapi/addentry.c           |    2 +-
 source4/setup/provision.zone                    |    2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/repl/drepl_partitions.c b/source4/dsdb/repl/drepl_partitions.c
index f36b735..88c4bbf 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 b88d2ce..36d5f92 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 bb44633..fbcde76 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 4ccf14d..ae47802 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 9e312dc..919f8f0 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}


-- 
Samba Shared Repository