[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  70da278 s3: Avoid leaking http_timestring in print_registry_key
      from  5049e3e s3:registry avoid pruning the sequencenumber while flushing the regsubkey_ctr

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


- Log -----------------------------------------------------------------
commit 70da27838bb3f6ed9c36add06ce0ccdf467ab1c3
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Jul 15 08:20:12 2011 +0200

    s3: Avoid leaking http_timestring in print_registry_key
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Fri Jul 15 09:44:05 CEST 2011 on sn-devel-104

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

Summary of changes:
 source3/utils/net_registry_util.c |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/net_registry_util.c b/source3/utils/net_registry_util.c
index 084378f..22cb3a5 100644
--- a/source3/utils/net_registry_util.c
+++ b/source3/utils/net_registry_util.c
@@ -27,12 +27,20 @@
 
 void print_registry_key(const char *keyname, NTTIME *modtime)
 {
+	const char *ts = _("None");
+	char *freeme = NULL;
+
+	if (modtime != 0) {
+		freeme = http_timestring(talloc_tos(),
+					 nt_time_to_unix(*modtime));
+		ts = freeme;
+	}
+
 	d_printf(_("Keyname   = %s\n"), keyname);
-	d_printf(_("Modtime   = %s\n"),
-		 modtime
-		 ? http_timestring(talloc_tos(), nt_time_to_unix(*modtime))
-		 : _("None"));
+	d_printf(_("Modtime   = %s\n"), ts);
 	d_printf("\n");
+
+	TALLOC_FREE(freeme);
 }
 
 void print_registry_value(const struct registry_value *valvalue, bool raw)


-- 
Samba Shared Repository