[SCM] Samba Shared Repository - branch master updated

[Simo Sorce]

The branch, master has been updated
       via  f7f67e9... Fix typo and convert spaces to tabs
       via  8fa81e9... Fix typo
      from  9adbba6... Allow "make test" to complete as root. Obviously only safe on tightly controlled developer machines. Jeremy.

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


- Log -----------------------------------------------------------------
commit f7f67e9e1f678e0256deeca94939bf29e6a04fa4
Author: Simo Sorce <idra at samba.org>
Date:   Tue Mar 9 16:40:55 2010 -0500

    Fix typo and convert spaces to tabs

commit 8fa81e99093bccf40c4ddea162896ccc020da9db
Author: Simo Sorce <idra at samba.org>
Date:   Tue Mar 9 16:41:44 2010 -0500

    Fix typo

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

Summary of changes:
 source3/lib/tldap.c                |    4 ++--
 source4/lib/ldb/common/ldb_parse.c |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/tldap.c b/source3/lib/tldap.c
index 3b256c4..c8f3af7 100644
--- a/source3/lib/tldap.c
+++ b/source3/lib/tldap.c
@@ -1080,8 +1080,8 @@ static int tldap_hex2char(const char *x)
 		else if (h1 >= '0') c = h1 - (int)'0';
 		c = c << 4;
 		if (h2 >= 'a') c += h2 - (int)'a' + 10;
-		else if (h1 >= 'A') c += h2 - (int)'A' + 10;
-		else if (h1 >= '0') c += h2 - (int)'0';
+		else if (h2 >= 'A') c += h2 - (int)'A' + 10;
+		else if (h2 >= '0') c += h2 - (int)'0';
 
 		return c;
 	}
diff --git a/source4/lib/ldb/common/ldb_parse.c b/source4/lib/ldb/common/ldb_parse.c
index 6d43000..a684593 100644
--- a/source4/lib/ldb/common/ldb_parse.c
+++ b/source4/lib/ldb/common/ldb_parse.c
@@ -54,8 +54,8 @@ static int ldb_parse_hex2char(const char *x)
 		else if (h1 >= '0') c = h1 - (int)'0';
 		c = c << 4;
 		if (h2 >= 'a') c += h2 - (int)'a' + 10;
-		else if (h1 >= 'A') c += h2 - (int)'A' + 10;
-		else if (h1 >= '0') c += h2 - (int)'0';
+		else if (h2 >= 'A') c += h2 - (int)'A' + 10;
+		else if (h2 >= '0') c += h2 - (int)'0';
 
 		return c;
 	}
@@ -93,8 +93,8 @@ struct ldb_val ldb_binary_decode(void *mem_ctx, const char *str)
 		if (str[i] == '\\') {
 			int c;
 
-                        c = ldb_parse_hex2char(&str[i+1]);
-                        if (c == -1) {
+			c = ldb_parse_hex2char(&str[i+1]);
+			if (c == -1) {
 				talloc_free(ret.data);
 				memset(&ret, 0, sizeof(ret));
 				return ret;


-- 
Samba Shared Repository