Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv

Conflicts:
	source4/lib/registry/ldb.c
	source4/rpc_server/winreg/rpc_winreg.c

6 files changed, 29 insertions, 16 deletions

diff --git a/source3/libnet/libnet_dssync.c b/source3/libnet/libnet_dssync.c
index bae03effed..81866c85ba 100644
--- a/source3/libnet/libnet_dssync.c
+++ b/source3/libnet/libnet_dssync.c
@@ -297,7 +297,7 @@ static NTSTATUS libnet_dssync_lookup_nc(TALLOC_CTX *mem_ctx,
 	req.req1.count		= 1;
 	req.req1.names		= names;
 	req.req1.format_flags	= DRSUAPI_DS_NAME_FLAG_NO_FLAGS;
-	req.req1.format_offered	= DRSUAPI_DS_NAME_FORMAT_UKNOWN;
+	req.req1.format_offered	= DRSUAPI_DS_NAME_FORMAT_UNKNOWN;
 	req.req1.format_desired	= DRSUAPI_DS_NAME_FORMAT_FQDN_1779;
 
 	status = rpccli_drsuapi_DsCrackNames(ctx->cli, mem_ctx,
@@ -539,17 +539,24 @@ static NTSTATUS libnet_dssync_getncchanges(TALLOC_CTX *mem_ctx,
 		if (level_out == 1) {
 			out_level = 1;
 			ctr1 = &ctr.ctr1;
-		} else if (level_out == 2) {
+		} else if (level_out == 2 && ctr.ctr2.mszip1.ts) {
 			out_level = 1;
-			ctr1 = ctr.ctr2.ctr.mszip1.ctr1;
+			ctr1 = &ctr.ctr2.mszip1.ts->ctr1;
 		} else if (level_out == 6) {
 			out_level = 6;
 			ctr6 = &ctr.ctr6;
 		} else if (level_out == 7
 			   && ctr.ctr7.level == 6
-			   && ctr.ctr7.type == DRSUAPI_COMPRESSION_TYPE_MSZIP) {
+			   && ctr.ctr7.type == DRSUAPI_COMPRESSION_TYPE_MSZIP
+			   && ctr.ctr7.ctr.mszip6.ts) {
 			out_level = 6;
-			ctr6 = ctr.ctr7.ctr.mszip6.ctr6;
+			ctr6 = &ctr.ctr7.ctr.mszip6.ts->ctr6;
+		} else if (level_out == 7
+			   && ctr.ctr7.level == 6
+			   && ctr.ctr7.type == DRSUAPI_COMPRESSION_TYPE_XPRESS
+			   && ctr.ctr7.ctr.xpress6.ts) {
+			out_level = 6;
+			ctr6 = &ctr.ctr7.ctr.xpress6.ts->ctr6;
 		}
 
 		if (out_level == 1) {
diff --git a/source3/libnet/libnet_dssync_keytab.c b/source3/libnet/libnet_dssync_keytab.c
index 6ba2c3aa41..6a3139d6ad 100644
--- a/source3/libnet/libnet_dssync_keytab.c
+++ b/source3/libnet/libnet_dssync_keytab.c
@@ -86,7 +86,7 @@ static NTSTATUS keytab_startup(struct dssync_context *ctx, TALLOC_CTX *mem_ctx,
 		old_utdv = talloc(mem_ctx, struct replUpToDateVectorBlob);
 
 		ndr_err = ndr_pull_struct_blob(&entry->password, old_utdv,
-				old_utdv,
+				NULL, old_utdv,
 				(ndr_pull_flags_fn_t)ndr_pull_replUpToDateVectorBlob);
 		if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 			NTSTATUS status = ndr_map_error2ntstatus(ndr_err);
@@ -124,7 +124,7 @@ static NTSTATUS keytab_finish(struct dssync_context *ctx, TALLOC_CTX *mem_ctx,
 			NDR_PRINT_DEBUG(replUpToDateVectorBlob, new_utdv);
 		}
 
-		ndr_err = ndr_push_struct_blob(&blob, mem_ctx, new_utdv,
+		ndr_err = ndr_push_struct_blob(&blob, mem_ctx, NULL, new_utdv,
 				(ndr_push_flags_fn_t)ndr_push_replUpToDateVectorBlob);
 		if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 			status = ndr_map_error2ntstatus(ndr_err);
@@ -179,7 +179,7 @@ static  NTSTATUS parse_supplemental_credentials(TALLOC_CTX *mem_ctx,
 	bool newer_keys = false;
 	uint32_t j;
 
-	ndr_err = ndr_pull_struct_blob_all(blob, mem_ctx, &scb,
+	ndr_err = ndr_pull_struct_blob_all(blob, mem_ctx, NULL, &scb,
 			(ndr_pull_flags_fn_t)ndr_pull_supplementalCredentialsBlob);
 	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 		status = ndr_map_error2ntstatus(ndr_err);
@@ -236,7 +236,7 @@ static  NTSTATUS parse_supplemental_credentials(TALLOC_CTX *mem_ctx,
 		status = NT_STATUS_NO_MEMORY;
 		goto done;
 	}
-	ndr_err = ndr_pull_struct_blob(&scpk_blob, mem_ctx, pkb,
+	ndr_err = ndr_pull_struct_blob(&scpk_blob, mem_ctx, NULL, pkb,
 			(ndr_pull_flags_fn_t)ndr_pull_package_PrimaryKerberosBlob);
 	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 		status = ndr_map_error2ntstatus(ndr_err);
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index a39dee676f..6935e000dc 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -357,10 +357,15 @@ static ADS_STATUS libnet_join_set_machine_spn(TALLOC_CTX *mem_ctx,
 	strupper_m(spn);
 	spn_array[0] = spn;
 
-	if (name_to_fqdn(my_fqdn, r->in.machine_name) &&
-	    !strequal(my_fqdn, r->in.machine_name)) {
+	if (!name_to_fqdn(my_fqdn, r->in.machine_name)
+	    || (strchr(my_fqdn, '.') == NULL)) {
+		fstr_sprintf(my_fqdn, "%s.%s", r->in.machine_name,
+			     r->out.dns_domain_name);
+	}
+
+	strlower_m(my_fqdn);
 
-		strlower_m(my_fqdn);
+	if (!strequal(my_fqdn, r->in.machine_name)) {
 		spn = talloc_asprintf(mem_ctx, "HOST/%s", my_fqdn);
 		if (!spn) {
 			return ADS_ERROR_LDAP(LDAP_NO_MEMORY);
@@ -770,7 +775,7 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx,
 	ZERO_STRUCT(user_pol);
 
 	if (!r->in.machine_password) {
-		r->in.machine_password = talloc_strdup(mem_ctx, generate_random_str(DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTH));
+		r->in.machine_password = generate_random_str(mem_ctx, DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTH);
 		NT_STATUS_HAVE_NO_MEMORY(r->in.machine_password);
 	}
 
diff --git a/source3/libnet/libnet_proto.h b/source3/libnet/libnet_proto.h
index 43046a44c0..69a16c1c7d 100644
--- a/source3/libnet/libnet_proto.h
+++ b/source3/libnet/libnet_proto.h
@@ -53,7 +53,7 @@ krb5_error_code libnet_keytab_add(struct libnet_keytab_context *ctx);
 
 struct libnet_keytab_entry *libnet_keytab_search(struct libnet_keytab_context *ctx,
 						 const char *principal, int kvno,
-						 const const krb5_enctype enctype,
+						 const krb5_enctype enctype,
 						 TALLOC_CTX *mem_ctx);
 #endif
 
diff --git a/source3/libnet/libnet_samsync.c b/source3/libnet/libnet_samsync.c
index daf27ffb51..64dcf6de51 100644
--- a/source3/libnet/libnet_samsync.c
+++ b/source3/libnet/libnet_samsync.c
@@ -65,7 +65,7 @@ static NTSTATUS fix_user(TALLOC_CTX *mem_ctx,
 		user->user_private_info.SensitiveData = data.data;
 		user->user_private_info.DataLength = data.length;
 
-		ndr_err = ndr_pull_struct_blob(&data, mem_ctx, &keys,
+		ndr_err = ndr_pull_struct_blob(&data, mem_ctx, NULL, &keys,
 			(ndr_pull_flags_fn_t)ndr_pull_netr_USER_KEYS);
 		if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 			dump_data(10, data.data, data.length);
@@ -397,7 +397,7 @@ NTSTATUS pull_netr_AcctLockStr(TALLOC_CTX *mem_ctx,
 
 	blob = data_blob_const(r->array, r->length);
 
-	ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, str,
+	ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, NULL, str,
 		       (ndr_pull_flags_fn_t)ndr_pull_netr_AcctLockStr);
 
 	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
diff --git a/source3/libnet/libnet_samsync_keytab.c b/source3/libnet/libnet_samsync_keytab.c
index f284f08ad9..9e666ced32 100644
--- a/source3/libnet/libnet_samsync_keytab.c
+++ b/source3/libnet/libnet_samsync_keytab.c
@@ -93,6 +93,7 @@ static NTSTATUS fetch_sam_entry_keytab(TALLOC_CTX *mem_ctx,
 					  ctx->dns_domain_name);
 	entry.password = data_blob_talloc(mem_ctx, nt_passwd, 16);
 	entry.kvno = ads_get_kvno(ctx->ads, entry.name);
+	entry.enctype = ENCTYPE_NULL;
 
 	NT_STATUS_HAVE_NO_MEMORY(entry.name);
 	NT_STATUS_HAVE_NO_MEMORY(entry.principal);