From cfc3b6e5f79f253e83dfbd13d47b671deb5801b3 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 5 Jul 2011 14:01:40 +0200 Subject: s3-printing: make sure to first migrate the printers then the security descriptor. Guenther Pair-Programmed-With: David Disseldorp --- source3/utils/net_printing.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'source3/utils') diff --git a/source3/utils/net_printing.c b/source3/utils/net_printing.c index cefbd6eec6..fd33ede152 100644 --- 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); } -- cgit