[SCM] Samba Shared Repository - branch v3-5-test updated

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  89b5ebe... s3:smbd: use StrCaseCmp() instead of strcasecmp
       via  81191c8... s3:smbd: Fix really ugly bool vs. int bug!!!
      from  8946a47... s3:passdb: only use gid_to_sid() result if the result is a group of our local sam

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


- Log -----------------------------------------------------------------
commit 89b5ebed83ce8e4363928b2b5ddcc2953762c56c
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Feb 9 18:58:36 2010 +0100

    s3:smbd: use StrCaseCmp() instead of strcasecmp
    
    metze
    (cherry picked from commit bc8242a08e1bb9489cc8171b1ec02bd2518b1857)
    
    Part of a fix for bug #7119 (support for large browselist).

commit 81191c8bbdf7517f35245cca6945ed898ae1e0e2
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Feb 9 18:54:41 2010 +0100

    s3:smbd: Fix really ugly bool vs. int bug!!!
    
    A comparison function for qsort needs to return an 'int'!
    Otherwise you'll get random results depending on the compiler
    and the architecture...
    
    metze
    (cherry picked from commit 1686a5e7e7eb1b411b003cbbde5c0d28741c6d02)
    
    Part of a fix for bug #7119 (support for large browselist).

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

Summary of changes:
 source3/smbd/lanman.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index 83f0da4..f43049c 100644
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -1351,10 +1351,9 @@ static int fill_srv_info(struct srv_info_struct *service,
 }
 
 
-static bool srv_comp(struct srv_info_struct *s1,struct srv_info_struct *s2)
+static int srv_comp(struct srv_info_struct *s1,struct srv_info_struct *s2)
 {
-#undef strcasecmp
-	return strcasecmp(s1->name,s2->name);
+	return StrCaseCmp(s1->name,s2->name);
 }
 
 /****************************************************************************
@@ -1515,7 +1514,7 @@ static bool api_RNetServerEnum2(connection_struct *conn, uint16 vuid,
 	return True;
 }
 
-static bool srv_name_match(const char *n1, const char *n2)
+static int srv_name_match(const char *n1, const char *n2)
 {
 	/*
 	 * [MS-RAP] footnote <88> for Section 3.2.5.15 says:
@@ -1524,7 +1523,7 @@ static bool srv_name_match(const char *n1, const char *n2)
 	 *  the server will return a list of servers that exist on
 	 *  the network greater than or equal to the FirstNameToReturn.
 	 */
-	int ret = strcasecmp(n1, n2);
+	int ret = StrCaseCmp(n1, n2);
 
 	if (ret <= 0) {
 		return 0;
@@ -1637,7 +1636,7 @@ static bool api_RNetServerEnum3(connection_struct *conn, uint16 vuid,
 			 */
 			for (;first > 0;) {
 				int ret;
-				ret = strcasecmp(first_name,
+				ret = StrCaseCmp(first_name,
 						 servers[first-1].name);
 				if (ret > 0) {
 					break;


-- 
Samba Shared Repository