r15309: normalize printing keys when deleting

diff --git a/source/printing/nt_printing.c b/source/printing/nt_printing.c
index 1a664fbb34eb1e51fbcbe3beb15e84adf08cfeda..54d7e8040cd357fb16ee92bc8b65e528ac2e761d 100644 (file)
--- a/source/printing/nt_printing.c
+++ b/source/printing/nt_printing.c
@@ -2298,18 +2298,14 @@ static int pack_values(NT_PRINTER_DATA *data, char *buf, int buflen)
 
 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();

diff --git a/source/rpc_server/srv_spoolss_nt.c b/source/rpc_server/srv_spoolss_nt.c
index aede762ed43ce29ac4e3ad4cf87d1173e60b7b07..70470a45e7d044b7dafb90125c6aed9e8e85e696 100644 (file)
--- a/source/rpc_server/srv_spoolss_nt.c
+++ b/source/rpc_server/srv_spoolss_nt.c
@@ -7657,21 +7657,6 @@ WERROR _spoolss_addprinterdriver(pipes_struct *p, SPOOL_Q_ADDPRINTERDRIVER *q_u,
                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