s3-printing: make sure to first migrate the printers then the security descriptor.

Guenther

Pair-Programmed-With: David Disseldorp <ddiss@suse.de>

diff --git a/source3/printing/nt_printing_migrate_internal.c b/source3/printing/nt_printing_migrate_internal.c
index 706249cff717c171668d550dcad8ca56d0a146b0..1bd61588fc2cb7bd66efe73c08538e4d375e20d9 100644 (file)
--- a/source3/printing/nt_printing_migrate_internal.c
+++ b/source3/printing/nt_printing_migrate_internal.c
@@ -143,6 +143,17 @@ static NTSTATUS migrate_internal(TALLOC_CTX *mem_ctx,
                        }
                        continue;
                }
+               SAFE_FREE(dbuf.dptr);
+       }
+
+       for (kbuf = tdb_firstkey_compat(tdb);
+            kbuf.dptr;
+            kbuf = tdb_nextkey_compat(tdb, kbuf))
+       {
+               dbuf = tdb_fetch_compat(tdb, kbuf);
+               if (!dbuf.dptr) {
+                       continue;
+               }
 
                if (strncmp((const char *) kbuf.dptr, SECDESC_PREFIX, strlen(SECDESC_PREFIX)) == 0) {
                        const char *secdesc_name = (const char *)(kbuf.dptr
@@ -154,16 +165,17 @@ static NTSTATUS migrate_internal(TALLOC_CTX *mem_ctx,
                                                 dbuf.dsize);
                        SAFE_FREE(dbuf.dptr);
                        /* currently no WERR_INVALID_PRINTER_NAME equivalent */
-                       if (NT_STATUS_EQUAL(status,
-                              werror_to_ntstatus(WERR_INVALID_PRINTER_NAME))) {
-                               DEBUG(2, ("Skipping migration for non-existent "
-                                               "secdesc: %s\n", secdesc_name));
+                       if (NT_STATUS_EQUAL(status, werror_to_ntstatus(WERR_INVALID_PRINTER_NAME)) ||
+                           NT_STATUS_EQUAL(status, werror_to_ntstatus(WERR_BADFILE))) {
+                               DEBUG(2, ("Skipping secdesc migration for non-existent "
+                                               "printer: %s\n", secdesc_name));
                        } else if (!NT_STATUS_IS_OK(status)) {
                                tdb_close(tdb);
                                return status;
                        }
                        continue;
                }
+               SAFE_FREE(dbuf.dptr);
        }
 
        tdb_close(tdb);

diff --git a/source3/utils/net_printing.c b/source3/utils/net_printing.c
index cefbd6eec6292b04f55868c70bbceaf7cc57c48f..fd33ede152666903a9bb2ef8ed3bbcd8bccefc46 100644 (file)
--- a/source3/utils/net_printing.c
+++ b/source3/utils/net_printing.c
@@ -284,6 +284,17 @@ static NTSTATUS printing_migrate_internal(struct net_context *c,
                        SAFE_FREE(dbuf.dptr);
                        continue;
                }
+               SAFE_FREE(dbuf.dptr);
+       }
+
+       for (kbuf = tdb_firstkey_compat(tdb);
+            kbuf.dptr;
+            kbuf = tdb_nextkey_compat(tdb, kbuf))
+       {
+               dbuf = tdb_fetch_compat(tdb, kbuf);
+               if (!dbuf.dptr) {
+                       continue;
+               }
 
                if (strncmp((const char *) kbuf.dptr, SECDESC_PREFIX, strlen(SECDESC_PREFIX)) == 0) {
                        printing_tdb_migrate_secdesc(tmp_ctx,
@@ -294,6 +305,7 @@ static NTSTATUS printing_migrate_internal(struct net_context *c,
                        SAFE_FREE(dbuf.dptr);
                        continue;
                }
+               SAFE_FREE(dbuf.dptr);
 
        }