From 166ffc0d0dd55e6d7f530cfb806aa21142088e26 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Fri, 16 Jan 2009 00:48:29 +0100 Subject: [PATCH] s3: put printing/ under cache_dir, not lock_dir Michael --- source3/printing/nt_printing.c | 2 +- source3/printing/printing.c | 4 ++-- source3/printing/printing_db.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index ac3817b94a8..bfbc35f3d3b 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -2577,7 +2577,7 @@ uint32 del_a_printer(const char *sharename) if (geteuid() == 0) { if (asprintf(&printdb_path, "%s%s.tdb", - lock_path("printing/"), + cache_path("printing/"), sharename) < 0) { return (uint32)-1; } diff --git a/source3/printing/printing.c b/source3/printing/printing.c index 0f38aeab806..fffe9178cf0 100644 --- a/source3/printing/printing.c +++ b/source3/printing/printing.c @@ -183,8 +183,8 @@ bool print_backend_init(struct messaging_context *msg_ctx) int services = lp_numservices(); int snum; - unlink(lock_path("printing.tdb")); - mkdir(lock_path("printing"),0755); + unlink(cache_path("printing.tdb")); + mkdir(cache_path("printing"),0755); /* handle a Samba upgrade */ diff --git a/source3/printing/printing_db.c b/source3/printing/printing_db.c index 94319f96d0b..746e768e485 100644 --- a/source3/printing/printing_db.c +++ b/source3/printing/printing_db.c @@ -91,7 +91,7 @@ struct tdb_print_db *get_print_db_byname(const char *printername) } if (asprintf(&printdb_path, "%s%s.tdb", - lock_path("printing/"), + cache_path("printing/"), printername) < 0) { DLIST_REMOVE(print_db_head, p); SAFE_FREE(p); -- 2.34.1