Author: jerry Date: 2006-06-22 17:25:50 +0000 (Thu, 22 Jun 2006) New Revision: 16465
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16465 Log: merge a few miniro SAMBA_3_0 fixes svn merge -r16435:16458 $SVNURL/branches/SAMBA_3_0 * note that I've skipped jra's change to the share_mode_entry since it si not critical for release. Maybe for 3.0.23a Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt branches/SAMBA_3_0_RELEASE/source/libads/cldap.c branches/SAMBA_3_0_RELEASE/source/libsmb/clientgen.c branches/SAMBA_3_0_RELEASE/source/utils/net_ads.c Changeset: Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt =================================================================== --- branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2006-06-22 17:06:36 UTC (rev 16464) +++ branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2006-06-22 17:25:50 UTC (rev 16465) @@ -58,6 +58,7 @@ via "net rpc user add" * Add "rpc shell" to the usage text for the net command. * Winbindd user aliases lookup fixes for large domains. + * Fix memleak in the CLDAP processing code. o Bjoern Jacke <[EMAIL PROTECTED]>. Modified: branches/SAMBA_3_0_RELEASE/source/libads/cldap.c =================================================================== --- branches/SAMBA_3_0_RELEASE/source/libads/cldap.c 2006-06-22 17:06:36 UTC (rev 16464) +++ branches/SAMBA_3_0_RELEASE/source/libads/cldap.c 2006-06-22 17:25:50 UTC (rev 16465) @@ -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/SAMBA_3_0_RELEASE/source/libsmb/clientgen.c =================================================================== --- branches/SAMBA_3_0_RELEASE/source/libsmb/clientgen.c 2006-06-22 17:06:36 UTC (rev 16464) +++ branches/SAMBA_3_0_RELEASE/source/libsmb/clientgen.c 2006-06-22 17:25:50 UTC (rev 16465) @@ -367,7 +367,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/SAMBA_3_0_RELEASE/source/utils/net_ads.c =================================================================== --- branches/SAMBA_3_0_RELEASE/source/utils/net_ads.c 2006-06-22 17:06:36 UTC (rev 16464) +++ branches/SAMBA_3_0_RELEASE/source/utils/net_ads.c 2006-06-22 17:25:50 UTC (rev 16465) @@ -286,6 +286,7 @@ goto retry; } else { DEBUG(0,("ads_connect: %s\n", ads_errstr(status))); + ads_destroy(&ads); return NULL; } }
