sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

r15309: normalize printing keys when deleting

Browse Source 
(This used to be commit 037f9f831e001a12261419e37c725558dd717af9)
This commit is contained in:
Gerald Carter 2006-04-28 15:35:42 +00:00 committed by Gerald (Jerry) Carter
parent 358fd531f4
commit d4a51cc500
2 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source3/printing/nt_printing.c
View File

@ -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();

15
source3/rpc_server/srv_spoolss_nt.c
View File

@ -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