[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-831-g7258c78

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  7258c780f0650c63d6c7c40fd704a9b841600f26 (commit)
       via  12e6818df1c77810a59a2896f8c44c91fc24e7ae (commit)
      from  27fea343d2eeff5b7d38092dd1286cb8e3478cbe (commit)

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


- Log -----------------------------------------------------------------
commit 7258c780f0650c63d6c7c40fd704a9b841600f26
Merge: 12e6818df1c77810a59a2896f8c44c91fc24e7ae 27fea343d2eeff5b7d38092dd1286cb8e3478cbe
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Apr 11 17:46:17 2008 -0700

    Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test

commit 12e6818df1c77810a59a2896f8c44c91fc24e7ae
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Apr 11 17:41:49 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 9797a7a..0349445 100644
--- a/source/nmbd/nmbd.c
+++ b/source/nmbd/nmbd.c
@@ -170,6 +170,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)) {
@@ -188,7 +189,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--) {
 		char str[INET6_ADDRSTRLEN];
@@ -280,8 +280,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