[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-28a-33-g68ecfa3

Jeremy Allison jra at samba.org
Sat Apr 12 00:48:12 GMT 2008


The branch, v3-0-test has been updated
       via  68ecfa3ca4574133997596d5ca4fa9f76cdd9dc1 (commit)
      from  8a0ab4cd46e70c0be288e9b3b1b701ced6478ba3 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test


- Log -----------------------------------------------------------------
commit 68ecfa3ca4574133997596d5ca4fa9f76cdd9dc1
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Apr 11 17:41:45 2008 -0700

    Fix bug #5386, don't keep printing the same waiting
    error message.
    Jeremy.

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

Summary of changes:
 source/nmbd/nmbd.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/nmbd/nmbd.c b/source/nmbd/nmbd.c
index ce4173a..df38399 100644
--- a/source/nmbd/nmbd.c
+++ b/source/nmbd/nmbd.c
@@ -157,6 +157,7 @@ static void reload_interfaces(time_t t)
 {
 	static time_t lastt;
 	int n;
+	bool print_waiting_msg = true;
 	struct subnet_record *subrec;
 
 	if (t && ((t - lastt) < NMBD_INTERFACES_RELOAD)) {
@@ -174,7 +175,6 @@ static void reload_interfaces(time_t t)
 	   some subnets */
 	load_interfaces();
 
-
 	/* find any interfaces that need adding */
 	for (n=iface_count() - 1; n >= 0; n--) {
 		struct interface *iface = get_interface(n);
@@ -235,8 +235,11 @@ static void reload_interfaces(time_t t)
 	/* We need to wait if there are no subnets... */
 	if (FIRST_SUBNET == NULL) {
 
-		DEBUG(0,("reload_interfaces: "
-			"No subnets to listen to. Waiting..\n"));
+		if (print_waiting_msg) {
+			DEBUG(0,("reload_interfaces: "
+				"No subnets to listen to. Waiting..\n"));
+			print_waiting_msg = false;
+		}
 
 		/*
 		 * Whilst we're waiting for an interface, allow SIGTERM to


-- 
Samba Shared Repository


More information about the samba-cvs mailing list