[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  08e0d94... replace: allow memmem() with an empty string to return NULL
      from  cc2ef27... s3:libads: retry with signing after getting LDAP_STRONG_AUTH_REQUIRED

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


- Log -----------------------------------------------------------------
commit 08e0d94faedc0793958183372f26f778f8ec8953
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue Mar 30 18:12:46 2010 +1100

    replace: allow memmem() with an empty string to return NULL
    
    This is how FreeBSD behaves. We don't rely on it returning the string
    in Samba.

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

Summary of changes:
 lib/replace/test/testsuite.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/test/testsuite.c b/lib/replace/test/testsuite.c
index 829e9f9..46697b5 100644
--- a/lib/replace/test/testsuite.c
+++ b/lib/replace/test/testsuite.c
@@ -1027,7 +1027,9 @@ static int test_memmem(void)
 	}
 
 	s = memmem("foo", 3, "", 0);
-	if (strcmp(s, "foo") != 0) {
+	/* it is allowable for this to return NULL (as happens on
+	   FreeBSD) */
+	if (s && strcmp(s, "foo") != 0) {
 		printf(__location__ ": Failed memmem\n");
 		return false;
 	}


-- 
Samba Shared Repository