[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  019f11d s3-printing: Fix double free of cups request.
       via  3ba3f68 s3-printing: very obvious fix for cups_pull_comment_location().
      from  628fcd1 s3-events: tevent_internal.h is not a public header

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 019f11dd5b3240d05c1abe30dec3d793d6919313
Author: Günther Deschner <gd at samba.org>
Date:   Tue May 10 15:49:05 2011 +0200

    s3-printing: Fix double free of cups request.
    
    We never free the request in our cups api usage except for here. The reason is
    probably htis (from the cupsDoConnect API docs):
    
    "This function sends the IPP request to the specified server, retrying and
    authenticating as necessary. The request is freed with ippDelete() after
    receiving a valid IPP response."
    
    Revert "Fix a memory leak in cups_pull_comment_location"
    
    This reverts commit fee2664dad37536b05ce8bdae3e74d45b257f632.
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Tue May 10 17:32:58 CEST 2011 on sn-devel-104

commit 3ba3f68e03510e3bb5b7627c200af0395e853bc2
Author: Günther Deschner <gd at samba.org>
Date:   Tue May 10 15:48:25 2011 +0200

    s3-printing: very obvious fix for cups_pull_comment_location().
    
    This has been in there since 2008...
    
    Guenther

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

Summary of changes:
 source3/printing/print_cups.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c
index da42cb6..ea2fc1d 100644
--- a/source3/printing/print_cups.c
+++ b/source3/printing/print_cups.c
@@ -1633,7 +1633,7 @@ bool cups_pull_comment_location(TALLOC_CTX *mem_ctx,
 	} else {
 		server = talloc_strdup(frame,cupsServer());
 	}
-	if (server) {
+	if (!server) {
 		goto out;
 	}
 	if (!push_utf8_talloc(frame, &sharename, printername, &size)) {
@@ -1731,10 +1731,6 @@ bool cups_pull_comment_location(TALLOC_CTX *mem_ctx,
 	if (response)
 		ippDelete(response);
 
-	if (request) {
-		ippDelete(request);
-	}
-
 	if (language)
 		cupsLangFree(language);
 


-- 
Samba Shared Repository