[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-777-g7048165

[Günther Deschner]

The branch, master has been updated
       via  7048165e7a7849a7a97041bcffca91586f1c8fa1 (commit)
       via  75030ff2b16a3ddb79367d970590da2375f7e3dc (commit)
      from  7180ae0b8e866d99de6827841970f16486eec7cd (commit)

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


- Log -----------------------------------------------------------------
commit 7048165e7a7849a7a97041bcffca91586f1c8fa1
Author: Günther Deschner <gd at samba.org>
Date:   Tue Aug 4 00:06:26 2009 +0200

    s4-ldap_server: fix generated error string in map_ldb_error().
    
    Guenther

commit 75030ff2b16a3ddb79367d970590da2375f7e3dc
Author: Günther Deschner <gd at samba.org>
Date:   Mon Aug 3 23:41:08 2009 +0200

    s3-spoolss: fix crash bug in spoolss_addprinterex_level_2.
    
    Guenther

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

Summary of changes:
 source3/rpc_server/srv_spoolss_nt.c |    2 +-
 source4/ldap_server/ldap_backend.c  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index d7bc262..ee07474 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -7593,7 +7593,7 @@ static WERROR spoolss_addprinterex_level_2(pipes_struct *p,
 	}
 
 	/* you must be a printer admin to add a new printer */
-	if (!print_access_check(NULL, snum, PRINTER_ACCESS_ADMINISTER)) {
+	if (!print_access_check(p->server_info, snum, PRINTER_ACCESS_ADMINISTER)) {
 		free_a_printer(&printer,2);
 		return WERR_ACCESS_DENIED;
 	}
diff --git a/source4/ldap_server/ldap_backend.c b/source4/ldap_server/ldap_backend.c
index 629cbab..67cc893 100644
--- a/source4/ldap_server/ldap_backend.c
+++ b/source4/ldap_server/ldap_backend.c
@@ -165,7 +165,7 @@ static int map_ldb_error(TALLOC_CTX *mem_ctx, int ldb_err,
 	break;
 	}
 
-	*errstring = talloc_asprintf(mem_ctx, "%08x: %s", err,
+	*errstring = talloc_asprintf(mem_ctx, "%08x: %s", W_ERROR_V(err),
 		ldb_strerror(ldb_err));
 	
 	/* result is 1:1 for now */


-- 
Samba Shared Repository