s3: put printing/ under cache_dir, not lock_dir

Michael

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index ac3817b94a8f43255a9825c09b72378e71f0135f..bfbc35f3d3b0c9307a066f9583338fc966de5b11 100644 (file)
--- 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 0f38aeab8063356041337b80300096ae6cfb67d8..fffe9178cf0d0fea02052fa75ab99099bff64a0b 100644 (file)
--- 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 94319f96d0bd1b4e51af37c0bfd778d8b601e76c..746e768e4854730b3c445005897cdcdd3270092d 100644 (file)
--- 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);