[SCM] Samba Shared Repository - branch master updated

Volker Lendecke vlendec at samba.org
Wed Jul 30 08:00:04 MDT 2014


The branch, master has been updated
       via  27b0d97 s3:param: move a variable into scope in lp_file_list_changed
       via  86d68c9 lib/util: remove outdated comment from debug.c
      from  6abeff5 s3: net time - fix usage and core dump.

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


- Log -----------------------------------------------------------------
commit 27b0d9740ee21676be701664ed1f746e1a2861a6
Author: Michael Adam <obnox at samba.org>
Date:   Sat Jul 26 01:30:17 2014 +0200

    s3:param: move a variable into scope in lp_file_list_changed
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Wed Jul 30 15:59:11 CEST 2014 on sn-devel-104

commit 86d68c94597e80c85d5cf7d13b9de8750c3f84dd
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jul 28 15:51:08 2014 +0200

    lib/util: remove outdated comment from debug.c
    
    These variables do not exist any more.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>

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

Summary of changes:
 lib/util/debug.c         |    4 ----
 source3/param/loadparm.c |    4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/util/debug.c b/lib/util/debug.c
index a46b275..80a3460 100644
--- a/lib/util/debug.c
+++ b/lib/util/debug.c
@@ -99,10 +99,6 @@ static struct {
 
 /* -------------------------------------------------------------------------- **
  * External variables.
- *
- *  debugf        - Debug file name.
- *  DEBUGLEVEL    - System-wide debug message limit.  Messages with message-
- *                  levels higher than DEBUGLEVEL will not be processed.
  */
 
 /*
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 13bd9b9..6b3e46e 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -2296,8 +2296,6 @@ bool lp_file_list_changed(void)
  	DEBUG(6, ("lp_file_list_changed()\n"));
 
 	while (f) {
-		time_t mod_time;
-
 		if (strequal(f->name, INCLUDE_REGISTRY_NAME)) {
 			struct smbconf_ctx *conf_ctx = lp_smbconf_ctx();
 
@@ -2311,7 +2309,9 @@ bool lp_file_list_changed(void)
 				return true;
 			}
 		} else {
+			time_t mod_time;
 			char *n2 = NULL;
+
 			n2 = talloc_sub_basic(talloc_tos(),
 					      get_current_username(),
 					      current_user_info.domain,


-- 
Samba Shared Repository


More information about the samba-cvs mailing list