From 933fdd4017fb79539b23222c8f8b538e11133130 Mon Sep 17 00:00:00 2001 From: Karolin Seeger Date: Wed, 23 Jul 2008 17:07:56 +0200 Subject: [PATCH] talloc_string_sub2: Don't return NULL if src is empty. This fixes BUG #5635. Finished print jobs were not removed from the $PRINTER.tdb file if "printing=cups". In print_queue_update, talloc_string_sub2 is used to assemble the "lprm command". In the case of using "printing=cups", the default "lprm command" is an empty string. talloc_string_sub2 is called with this empty string and returns NULL which leads to exiting print_queue_update without doing the actual print queue update. Signed-off by Michael Adam (This used to be commit 03d66554d1bbd9d6c72a3dd5203e5305343c76b8) --- source3/lib/util_str.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c index 7cb57adbb59..5f26cc80f8c 100644 --- a/source3/lib/util_str.c +++ b/source3/lib/util_str.c @@ -1230,7 +1230,7 @@ char *talloc_string_sub2(TALLOC_CTX *mem_ctx, const char *src, char *string; ssize_t ls,lp,li,ld, i; - if (!insert || !pattern || !*pattern || !src || !*src) { + if (!insert || !pattern || !*pattern || !src) { return NULL; } -- 2.11.4.GIT