Merge remote-tracking branch 'origin/next'

[ipfire-2.x.git] / src / patches / samba / samba-3.6.99-fix_memleak_in_printer_list.patch

diff --git a/src/patches/samba/samba-3.6.99-fix_memleak_in_printer_list.patch b/src/patches/samba/samba-3.6.99-fix_memleak_in_printer_list.patch
deleted file mode 100644 (file)
index 979809c..0000000
--- a/src/patches/samba/samba-3.6.99-fix_memleak_in_printer_list.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-commit 5c6cbc0becb78f57dea333185a56ea782716c334
-Author:     Jeremy Allison <jra@samba.org>
-AuthorDate: Mon Feb 24 16:18:31 2014 -0800
-Commit:     Andreas Schneider <asn@samba.org>
-CommitDate: Fri Feb 28 17:17:49 2014 +0100
-
-    s3-printing: Fix obvious memory leak in printer_list_get_printer().
-    
-    https://bugzilla.samba.org/show_bug.cgi?id=9993
-    
-    Signed-off-by: Jeremy Allison <jra@samba.org>
-    Reviewed-by: Ira Cooper <ira@samba.org>
-    Reviewed-by: Andreas Schneider <asn@samba.org>
-    
-    Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
-    Autobuild-Date(master): Tue Feb 25 13:19:37 CET 2014 on sn-devel-104
-    
-    (cherry picked from commit 148bbdd8d04400b5d873f636671dd443952ca04f)
----
- source3/printing/printer_list.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/source3/printing/printer_list.c b/source3/printing/printer_list.c
-index 8f196a5..603ce4b 100644
---- a/source3/printing/printer_list.c
-+++ b/source3/printing/printer_list.c
-@@ -133,6 +133,7 @@ NTSTATUS printer_list_get_printer(TALLOC_CTX *mem_ctx,
- done:
-       SAFE_FREE(nstr);
-       SAFE_FREE(cstr);
-+      SAFE_FREE(lstr);
-       TALLOC_FREE(key);
-       return status;
- }