From: Volker Lendecke <vl@samba.org>
Date: Thu, 26 Jun 2008 14:51:45 +0000 (+0200)
Subject: Fix valgrind errors in _spoolss_addprinterdriver
X-Git-Tag: samba-3.3.0pre1~740
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e7effd58f7790d6e71e38c990f6cb05456e47e1;p=thirdparty%2Fsamba.git

Fix valgrind errors in _spoolss_addprinterdriver

Jerry, this was dropped as part of your SVN r15309 (037f9f83). Can you please
check?

Thanks,

Volker
(cherry picked from commit 5aa2411f0b3720b790439359a2dadb23008e936e)
---

diff --git a/source/rpc_server/srv_spoolss_nt.c b/source/rpc_server/srv_spoolss_nt.c
index d58b16c206c..cb784a65395 100644
--- a/source/rpc_server/srv_spoolss_nt.c
+++ b/source/rpc_server/srv_spoolss_nt.c
@@ -7858,6 +7858,17 @@ WERROR _spoolss_addprinterdriver(pipes_struct *p, SPOOL_Q_ADDPRINTERDRIVER *q_u,
 		goto done;
 	}
 
+        switch(level) {
+	case 3:
+		fstrcpy(driver_name,
+			driver.info_3->name ? driver.info_3->name : "");
+		break;
+	case 6:
+		fstrcpy(driver_name,
+			driver.info_6->name ?  driver.info_6->name : "");
+		break;
+        }
+
 	/*
 	 * I think this is where he DrvUpgradePrinter() hook would be
 	 * be called in a driver's interface DLL on a Windows NT 4.0/2k