[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  cc339b0 libads: improve debug messages in sitename_fetch()
       via  ce8de54 selftest: check for smbd on a 1-second basis.
       via  25fee06 selftest: check for winbind on 1-second basis
       via  e8bab7e libsmb:namequery: fix typo in comment in get_dc_list()
      from  9d29593 tevent: Clarify apparently useless conditions

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


- Log -----------------------------------------------------------------
commit cc339b00697ce880fa7137222a0424fa840e6052
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jul 12 10:23:24 2016 +0200

    libads: improve debug messages in sitename_fetch()
    
    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): Tue Jul 12 21:23:48 CEST 2016 on sn-devel-144

commit ce8de54a6821147384509e0db3a7fb8928592879
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jul 12 13:16:27 2016 +0200

    selftest: check for smbd on a 1-second basis.
    
    Chance to reduce the overall time spent in checking for smbd
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>

commit 25fee06e0c56dd7907ff2719ff61e9fe74dc71e6
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jun 16 01:00:13 2016 +0200

    selftest: check for winbind on 1-second basis
    
    There is a chance to reduce the overall time spent checking.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>

commit e8bab7e5b273cb74332fc163d9e57a15fca7a0a4
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jul 12 10:43:45 2016 +0200

    libsmb:namequery: fix typo in comment in get_dc_list()
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>

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

Summary of changes:
 selftest/target/Samba3.pm       | 12 ++++++------
 source3/libads/sitename_cache.c |  7 +++----
 source3/libsmb/namequery.c      |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 61ec986..4e3169d 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -1888,11 +1888,11 @@ sub wait_for_start($$$$$)
 	    do {
 		$ret = system("SELFTEST_WINBINDD_SOCKET_DIR=" . $envvars->{SELFTEST_WINBINDD_SOCKET_DIR} . " " . Samba::bindir_path($self, "wbinfo") . " --ping-dc");
 		if ($ret != 0) {
-		    sleep(2);
+		    sleep(1);
 		}
 		$count++;
-	    } while ($ret != 0 && $count < 10);
-	    if ($count == 10) {
+	    } while ($ret != 0 && $count < 20);
+	    if ($count == 20) {
 		print "WINBINDD not reachable after 20 seconds\n";
 		teardown_env($self, $envvars);
 		return 0;
@@ -1907,11 +1907,11 @@ sub wait_for_start($$$$$)
 	    do {
 		$ret = system(Samba::bindir_path($self, "smbclient") ." $envvars->{CONFIGURATION} -L $envvars->{SERVER} -U% -p 139");
 		if ($ret != 0) {
-		    sleep(2);
+		    sleep(1);
 		}
 		$count++
-	    } while ($ret != 0 && $count < 10);
-	    if ($count == 10) {
+	    } while ($ret != 0 && $count < 20);
+	    if ($count == 20) {
 		print "SMBD failed to start up in a reasonable time (20sec)\n";
 		teardown_env($self, $envvars);
 		return 0;
diff --git a/source3/libads/sitename_cache.c b/source3/libads/sitename_cache.c
index b064aea..3a13107 100644
--- a/source3/libads/sitename_cache.c
+++ b/source3/libads/sitename_cache.c
@@ -98,11 +98,10 @@ char *sitename_fetch(TALLOC_CTX *mem_ctx, const char *realm)
 	ret = gencache_get( key, mem_ctx, &sitename, &timeout );
 	SAFE_FREE(key);
 	if ( !ret ) {
-		DEBUG(5,("sitename_fetch: No stored sitename for %s\n",
-			query_realm));
+		DBG_INFO("No stored sitename for realm '%s'\n", query_realm);
 	} else {
-		DEBUG(5,("sitename_fetch: Returning sitename for %s: \"%s\"\n",
-			query_realm, sitename ));
+		DBG_INFO("Returning sitename for realm '%s': \"%s\"\n",
+			 query_realm, sitename);
 	}
 	return sitename;
 }
diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index 4709c03..945fc64 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -3173,7 +3173,7 @@ static NTSTATUS get_dc_list(const char *domain,
 			next_token_talloc(ctx, &p, &name, LIST_SEP)) {
 		struct sockaddr_storage name_ss;
 
-		/* copy any addersses from the auto lookup */
+		/* copy any addresses from the auto lookup */
 
 		if (strequal(name, "*")) {
 			for (j=0; j<auto_count; j++) {


-- 
Samba Shared Repository