svn commit: samba r16459 - in branches/tmp/vl-messaging/source: libads libsmb utils

[ab at samba.org]

Author: ab
Date: 2006-06-22 13:07:13 +0000 (Thu, 22 Jun 2006)
New Revision: 16459

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16459

Log:
Merge -r 16438:16458 with trunk
Modified:
   branches/tmp/vl-messaging/source/libads/cldap.c
   branches/tmp/vl-messaging/source/libsmb/clientgen.c
   branches/tmp/vl-messaging/source/utils/net_ads.c


Changeset:
Modified: branches/tmp/vl-messaging/source/libads/cldap.c
===================================================================
--- branches/tmp/vl-messaging/source/libads/cldap.c	2006-06-22 08:52:01 UTC (rev 16458)
+++ branches/tmp/vl-messaging/source/libads/cldap.c	2006-06-22 13:07:13 UTC (rev 16459)
@@ -225,6 +225,7 @@
 	asn1_end_tag(&data);
 
 	if (data.has_error) {
+		asn1_free(&data);
 		DEBUG(1,("Failed to parse cldap reply\n"));
 		return -1;
 	}
@@ -262,6 +263,8 @@
 	data_blob_free(&os3);
 	data_blob_free(&blob);
 	
+	asn1_free(&data);
+
 	return 0;
 }
 

Modified: branches/tmp/vl-messaging/source/libsmb/clientgen.c
===================================================================
--- branches/tmp/vl-messaging/source/libsmb/clientgen.c	2006-06-22 08:52:01 UTC (rev 16458)
+++ branches/tmp/vl-messaging/source/libsmb/clientgen.c	2006-06-22 13:07:13 UTC (rev 16459)
@@ -357,7 +357,7 @@
 	ret = cli_close(cli->cli, cli->fnum);
 
 	if (!ret) {
-		DEBUG(0,("cli_rpc_pipe_close: cli_close failed on pipe %s, "
+		DEBUG(1,("cli_rpc_pipe_close: cli_close failed on pipe %s, "
                          "fnum 0x%x "
                          "to machine %s.  Error was %s\n",
                          cli->pipe_name,

Modified: branches/tmp/vl-messaging/source/utils/net_ads.c
===================================================================
--- branches/tmp/vl-messaging/source/utils/net_ads.c	2006-06-22 08:52:01 UTC (rev 16458)
+++ branches/tmp/vl-messaging/source/utils/net_ads.c	2006-06-22 13:07:13 UTC (rev 16459)
@@ -286,6 +286,7 @@
 			goto retry;
 		} else {
 			DEBUG(0,("ads_connect: %s\n", ads_errstr(status)));
+			ads_destroy(&ads);
 			return NULL;
 		}
 	}