summaryrefslogtreecommitdiff
path: root/source3/printing
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2006-04-28 15:35:42 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:16:34 -0500
commitd4a51cc5009ac2794070e8f9b159d17be7af8a47 (patch)
treea3f1135ac34abdfc0380f87e93b1be2055fb2228 /source3/printing
parent358fd531f47cce6a28f9f1d787341bc9d0fdd846 (diff)
downloadsamba-d4a51cc5009ac2794070e8f9b159d17be7af8a47.tar.gz
samba-d4a51cc5009ac2794070e8f9b159d17be7af8a47.tar.bz2
samba-d4a51cc5009ac2794070e8f9b159d17be7af8a47.zip
r15309: normalize printing keys when deleting
(This used to be commit 037f9f831e001a12261419e37c725558dd717af9)
Diffstat (limited to 'source3/printing')
-rw-r--r--source3/printing/nt_printing.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 1a664fbb34..54d7e8040c 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/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();