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

[Jeremy Allison]

The branch, v3-6-test has been updated
       via  4ab62fd Oops. Fix the build after the last commit. Sorry.
       via  5e331da s3-spoolss: Fixed a possible crash bug. (cherry picked from commit 80eba8143802dec1cad6debd85df3ab5ff47c83e)
      from  7c99b9e s3: Prune the printername cache when a printer is deleted

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


- Log -----------------------------------------------------------------
commit 4ab62fdc3612d41b83ee80d3661a3a84e786f891
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Sep 8 13:03:21 2010 -0700

    Oops. Fix the build after the last commit. Sorry.

commit 5e331da6afd5c65f2b29958b75aca4c5be2c5341
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Sep 6 16:07:24 2010 +0200

    s3-spoolss: Fixed a possible crash bug.
    (cherry picked from commit 80eba8143802dec1cad6debd85df3ab5ff47c83e)

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

Summary of changes:
 source3/rpc_server/srv_spoolss_util.c |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c
index f8b29fc..3591ab2 100644
--- a/source3/rpc_server/srv_spoolss_util.c
+++ b/source3/rpc_server/srv_spoolss_util.c
@@ -2320,9 +2320,22 @@ WERROR winreg_get_printer_secdesc(TALLOC_CTX *mem_ctx,
 	goto done;
 
 create_default:
+	result = winreg_printer_openkey(tmp_ctx,
+					server_info,
+					&winreg_pipe,
+					path,
+					"",
+					true,
+					access_mask,
+					&hive_hnd,
+					&key_hnd);
+	if (!W_ERROR_IS_OK(result)) {
+		goto done;
+	}
+
 	result = spoolss_create_default_secdesc(tmp_ctx, &secdesc);
 	if (!W_ERROR_IS_OK(result)) {
-		return result;
+		goto done;
 	}
 
 	/* If security descriptor is owned by S-1-1-0 and winbindd is up,


-- 
Samba Shared Repository