[SCM] Samba Shared Repository - branch v3-6-test updated

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  0f14965 s3-smbd: Initialize the print backend after we setup winreg.
       via  b61e67d s4-torture: let torture_suite_add_ndr_pull_test always work with NDR_SCALARS|NDR_BUFFERS flags.
      from  71c4227 s3: Fix bug #9085.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 0f1496516d4f4c3da0fb875e944b48861ef2330b
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Aug 28 14:53:01 2012 +0200

    s3-smbd: Initialize the print backend after we setup winreg.
    
    The print backend init also migrates the printing tdb to winreg. For
    this we need to setup the winreg pipe first.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    
    Fix bug #9122 - winreg_printer_openkey: Could not open HKLM hive:
    NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE.

commit b61e67d9fbb5d412da31233c6cd08ebdea6718ac
Author: Günther Deschner <gd at samba.org>
Date:   Tue Aug 28 14:30:13 2012 +0200

    s4-torture: let torture_suite_add_ndr_pull_test always work with NDR_SCALARS|NDR_BUFFERS flags.
    
    I checked all the callers (one) that needs them.
    
    Guenther
    
    See bug #9026 - 3.6.6 upgrade from 3.5.x fails with "Couldn't migrate printers
    tdb file: NT_STATUS_NO_MEMORY" for details.

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

Summary of changes:
 source3/smbd/server.c     |   10 +++++++---
 source4/torture/ndr/ndr.h |    2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 9a8cdc0..2400ce4 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1228,9 +1228,6 @@ extern void build_options(bool screen);
 		return -1;
 	}
 
-	if (!print_backend_init(smbd_messaging_context()))
-		exit(1);
-
 	if (!init_guest_info()) {
 		DEBUG(0,("ERROR: failed to setup guest info.\n"));
 		return -1;
@@ -1257,6 +1254,13 @@ extern void build_options(bool screen);
 		exit(1);
 	}
 
+	/*
+	 * The print backend init also migrates the printing tdb's,
+	 * this requires a winreg pipe.
+	 */
+	if (!print_backend_init(smbd_messaging_context()))
+		exit(1);
+
 	/* Publish nt printers, this requires a working winreg pipe */
 	pcap_cache_reload(server_event_context(), smbd_messaging_context(),
 			  &reload_printers);
diff --git a/source4/torture/ndr/ndr.h b/source4/torture/ndr/ndr.h
index 3de6b8b..b248527 100644
--- a/source4/torture/ndr/ndr.h
+++ b/source4/torture/ndr/ndr.h
@@ -43,7 +43,7 @@ _PUBLIC_ struct torture_test *_torture_suite_add_ndr_pull_inout_test(
 #define torture_suite_add_ndr_pull_test(suite,name,data,check_fn) \
 		_torture_suite_add_ndr_pull_test(suite, #name, \
 			 (ndr_pull_flags_fn_t)ndr_pull_ ## name, data_blob_talloc(suite, data, sizeof(data)), \
-			 sizeof(struct name), 0, (bool (*) (struct torture_context *, void *)) check_fn);
+			 sizeof(struct name), NDR_SCALARS|NDR_BUFFERS, (bool (*) (struct torture_context *, void *)) check_fn);
 
 #define torture_suite_add_ndr_pull_fn_test(suite,name,data,flags,check_fn) \
 		_torture_suite_add_ndr_pull_test(suite, #name "_" #flags, \


-- 
Samba Shared Repository