svn commit: samba r15309 - branches/SAMBA_3_0/source/printing branches/SAMBA_3_0/source/rpc_server trunk/source/printing trunk/source/rpc_server

[jerry at samba.org]

Author: jerry
Date: 2006-04-28 15:35:42 +0000 (Fri, 28 Apr 2006)
New Revision: 15309

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15309

Log:
normalize printing keys when deleting
Modified:
   branches/SAMBA_3_0/source/printing/nt_printing.c
   branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c
   trunk/source/printing/nt_printing.c
   trunk/source/rpc_server/srv_spoolss_nt.c


Changeset:
Modified: branches/SAMBA_3_0/source/printing/nt_printing.c
===================================================================
--- branches/SAMBA_3_0/source/printing/nt_printing.c	2006-04-28 15:08:52 UTC (rev 15308)
+++ branches/SAMBA_3_0/source/printing/nt_printing.c	2006-04-28 15:35:42 UTC (rev 15309)
@@ -2298,18 +2298,14 @@
 
 uint32 del_a_printer(const char *sharename)
 {
-	pstring key;
 	TDB_DATA kbuf;
 	pstring printdb_path;
 
-	slprintf(key, sizeof(key)-1, "%s%s", PRINTERS_PREFIX, sharename);
-	kbuf.dptr=key;
-	kbuf.dsize=strlen(key)+1;
+	kbuf = make_printer_tdbkey( sharename );
 	tdb_delete(tdb_printers, kbuf);
 
-	slprintf(key, sizeof(key)-1, "%s%s", SECDESC_PREFIX, sharename);
-	kbuf.dptr=key;
-	kbuf.dsize=strlen(key)+1;
+	kbuf.dptr = make_printers_secdesc_tdbkey( sharename );
+	kbuf.dsize = strlen(kbuf.dptr) + 1;
 	tdb_delete(tdb_printers, kbuf);
 
 	close_all_print_db();

Modified: branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c	2006-04-28 15:08:52 UTC (rev 15308)
+++ branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c	2006-04-28 15:35:42 UTC (rev 15309)
@@ -7657,21 +7657,6 @@
 		goto done;
 	}
 
-	/* BEGIN_ADMIN_LOG */
-        switch(level) {
-	    case 3:
-		fstrcpy(driver_name, driver.info_3->name ? driver.info_3->name : "");
-		sys_adminlog(LOG_INFO,"Added printer driver. Print driver name: %s. Print driver OS: %s. Administrator name: %s.",
-			driver_name, get_drv_ver_to_os(driver.info_3->cversion),uidtoname(user.ut.uid));
-		break;
-	    case 6:   
-		fstrcpy(driver_name, driver.info_6->name ?  driver.info_6->name : "");
-		sys_adminlog(LOG_INFO,"Added printer driver. Print driver name: %s. Print driver OS: %s. Administrator name: %s.",
-			driver_name, get_drv_ver_to_os(driver.info_6->version),uidtoname(user.ut.uid));
-		break;
-        }
-	/* END_ADMIN_LOG */
-
 	/* 
 	 * 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

Modified: trunk/source/printing/nt_printing.c
===================================================================
--- trunk/source/printing/nt_printing.c	2006-04-28 15:08:52 UTC (rev 15308)
+++ trunk/source/printing/nt_printing.c	2006-04-28 15:35:42 UTC (rev 15309)
@@ -2298,18 +2298,14 @@
 
 uint32 del_a_printer(const char *sharename)
 {
-	pstring key;
 	TDB_DATA kbuf;
 	pstring printdb_path;
 
-	slprintf(key, sizeof(key)-1, "%s%s", PRINTERS_PREFIX, sharename);
-	kbuf.dptr=key;
-	kbuf.dsize=strlen(key)+1;
+	kbuf = make_printer_tdbkey( sharename );
 	tdb_delete(tdb_printers, kbuf);
 
-	slprintf(key, sizeof(key)-1, "%s%s", SECDESC_PREFIX, sharename);
-	kbuf.dptr=key;
-	kbuf.dsize=strlen(key)+1;
+	kbuf.dptr = make_printers_secdesc_tdbkey( sharename );
+	kbuf.dsize = strlen(kbuf.dptr) + 1;
 	tdb_delete(tdb_printers, kbuf);
 
 	close_all_print_db();

Modified: trunk/source/rpc_server/srv_spoolss_nt.c
===================================================================
--- trunk/source/rpc_server/srv_spoolss_nt.c	2006-04-28 15:08:52 UTC (rev 15308)
+++ trunk/source/rpc_server/srv_spoolss_nt.c	2006-04-28 15:35:42 UTC (rev 15309)
@@ -7657,21 +7657,6 @@
 		goto done;
 	}
 
-	/* BEGIN_ADMIN_LOG */
-        switch(level) {
-	    case 3:
-		fstrcpy(driver_name, driver.info_3->name ? driver.info_3->name : "");
-		sys_adminlog(LOG_INFO,"Added printer driver. Print driver name: %s. Print driver OS: %s. Administrator name: %s.",
-			driver_name, get_drv_ver_to_os(driver.info_3->cversion),uidtoname(user.ut.uid));
-		break;
-	    case 6:   
-		fstrcpy(driver_name, driver.info_6->name ?  driver.info_6->name : "");
-		sys_adminlog(LOG_INFO,"Added printer driver. Print driver name: %s. Print driver OS: %s. Administrator name: %s.",
-			driver_name, get_drv_ver_to_os(driver.info_6->version),uidtoname(user.ut.uid));
-		break;
-        }
-	/* END_ADMIN_LOG */
-
 	/* 
 	 * 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