[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3413-g03d6655

[kseeger@xxxxxxxxx (Karolin Seeger)]

The branch, v3-3-test has been updated
       via  03d66554d1bbd9d6c72a3dd5203e5305343c76b8 (commit)
      from  167d611b525db6d103a7f83fd5a19792be4e7745 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 03d66554d1bbd9d6c72a3dd5203e5305343c76b8
Author: Karolin Seeger <kseeger@xxxxxxxxx>
Date:   Wed Jul 23 17:07:56 2008 +0200

    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 <obnox@xxxxxxxxx>

-----------------------------------------------------------------------

Summary of changes:
 source/lib/util_str.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/util_str.c b/source/lib/util_str.c
index 7cb57ad..5f26cc8 100644
--- a/source/lib/util_str.c
+++ b/source/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;
        }
 


-- 
Samba Shared Repository