svn commit: samba r23463 - in branches/SAMBA_3_0_26/source/registry: .

[obnox at samba.org]

Author: obnox
Date: 2007-06-13 10:40:31 +0000 (Wed, 13 Jun 2007)
New Revision: 23463

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

Log:
Merge r19853 and r19858 from 3_0:

fix a memleak, add a const, update a link


Modified:
   branches/SAMBA_3_0_26/source/registry/reg_perfcount.c


Changeset:
Modified: branches/SAMBA_3_0_26/source/registry/reg_perfcount.c
===================================================================
--- branches/SAMBA_3_0_26/source/registry/reg_perfcount.c	2007-06-13 10:32:57 UTC (rev 23462)
+++ branches/SAMBA_3_0_26/source/registry/reg_perfcount.c	2007-06-13 10:40:31 UTC (rev 23463)
@@ -358,6 +358,7 @@
     
 	memset(buf, 0, PERFCOUNT_MAX_LEN);
 	memcpy(buf, data.dptr, data.dsize);
+	SAFE_FREE(data.dptr);
 	return (uint32)atoi(buf);
 }
 
@@ -1321,11 +1322,15 @@
 /*********************************************************************
 *********************************************************************/
 
-WERROR reg_perfcount_get_hkpd(prs_struct *ps, uint32 max_buf_size, uint32 *outbuf_len, char *object_ids)
+WERROR reg_perfcount_get_hkpd(prs_struct *ps, uint32 max_buf_size, uint32 *outbuf_len, const char *object_ids)
 {
 	/*
 	 * For a detailed description of the layout of this structure,
 	 * see http://msdn.microsoft.com/library/default.asp?url=/library/en-us/perfmon/base/performance_data_format.asp
+	 *
+	 * By 2006-11-23 this link did not work anymore, I found something
+	 * promising under
+	 * http://msdn2.microsoft.com/en-us/library/aa373105.aspx -- vl
 	 */
 	PERF_DATA_BLOCK block;
 	uint32 buffer_size, base_index;