Changeset 736 for branches/samba-3.5.x/source3/lib

Timestamp:

Nov 12, 2012, 5:38:52 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.16

File:

• branches/samba-3.5.x/source3/lib/debug.c (modified) (3 diffs)

branches/samba-3.5.x/source3/lib/debug.c

@@ -658 +658 @@
                         fname = SMB_STRDUP(logfname);
                         if (!fname) {
+                                TALLOC_FREE(logfname);
                                 return false;
                         }
                 }
+                TALLOC_FREE(logfname);
         }
 
@@ -1029 +1031 @@
         if( lp_timestamp_logs() || lp_debug_prefix_timestamp() || !(lp_loaded()) ) {
                 char header_str[200];
+                char *curtime = current_timestring(talloc_tos(),
+                                        lp_debug_hires_timestamp());
 
                 header_str[0] = '\0';
@@ -1051 +1055 @@
                                  default_classname_table[cls]);
                 }
-  
+
                 /* Print it all out at once to prevent split syslog output. */
                 if( lp_debug_prefix_timestamp() ) {
                     (void)Debug1( "[%s, %2d%s] ",
-                        current_timestring(talloc_tos(),
-                                           lp_debug_hires_timestamp()),
+                        curtime,
                         level, header_str);
                 } else {
                     (void)Debug1( "[%s, %2d%s] %s(%s)\n",
-                        current_timestring(talloc_tos(),
-                                           lp_debug_hires_timestamp()),
+                        curtime,
                         level, header_str, location, func );
                 }
+                TALLOC_FREE(curtime);
         }