[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  a2cd203... s3:spoolss: construct the devmode the same way for level 2 and 8
      from  1e9df26... s3:cli_netlogon: keep the the correct negotiate_flags on the cli->dc structure

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


- Log -----------------------------------------------------------------
commit a2cd2039824181494eb1496068d2121ee6150839
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Feb 19 09:09:40 2010 +0100

    s3:spoolss: construct the devmode the same way for level 2 and 8
    
    metze

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

Summary of changes:
 source3/rpc_server/srv_spoolss_nt.c |   20 +++-----------------
 1 files changed, 3 insertions(+), 17 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 c555a31..a5484f8 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -3949,25 +3949,11 @@ static WERROR construct_printer_info8(TALLOC_CTX *mem_ctx,
 				      struct spoolss_DeviceModeInfo *r,
 				      int snum)
 {
-	struct spoolss_DeviceMode *devmode;
-	WERROR result;
-
-	if (!ntprinter->info_2->devmode) {
-		r->devmode = NULL;
-		return WERR_OK;
-	}
-
-	devmode = TALLOC_ZERO_P(mem_ctx, struct spoolss_DeviceMode);
-	W_ERROR_HAVE_NO_MEMORY(devmode);
-
-	result = convert_nt_devicemode(mem_ctx, devmode, ntprinter->info_2->devmode);
-	if (!W_ERROR_IS_OK(result)) {
-		TALLOC_FREE(devmode);
-		return result;
+	r->devmode = construct_dev_mode(mem_ctx, lp_const_servicename(snum));
+	if (!r->devmode) {
+		DEBUG(8,("Returning NULL Devicemode!\n"));
 	}
 
-	r->devmode	= devmode;
-
 	return WERR_OK;
 }
 


-- 
Samba Shared Repository