[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  82b1702 Remove rawmemchr calls - found by Ira Cooper. These are glibc-specific calls, makes us completely non-portable.
      from  1d471ee s3/packaging: Fix rpm build issues on RHEL4.

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


- Log -----------------------------------------------------------------
commit 82b1702284ba2bb61b23e1f14ce9145d896c36c0
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Nov 18 13:13:02 2011 -0800

    Remove rawmemchr calls - found by Ira Cooper. These are glibc-specific calls, makes us completely non-portable.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Fri Nov 18 23:50:50 CET 2011 on sn-devel-104

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

Summary of changes:
 source3/utils/net_registry_check.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/net_registry_check.c b/source3/utils/net_registry_check.c
index 22d18a6..0936aea 100644
--- a/source3/utils/net_registry_check.c
+++ b/source3/utils/net_registry_check.c
@@ -212,10 +212,10 @@ static bool tdb_data_is_empty(TDB_DATA d) {
 }
 
 static bool tdb_data_is_cstr(TDB_DATA d) {
-	if (tdb_data_is_empty(d) || (d.dptr[d.dsize-1] != '\0')) {
+	if (tdb_data_is_empty(d)) {
 		return false;
 	}
-	return rawmemchr(d.dptr, '\0') == &d.dptr[d.dsize-1];
+	return (d.dptr[d.dsize-1] == '\0');
 }
 
 static char* tdb_data_print(TALLOC_CTX *mem_ctx, TDB_DATA d)
@@ -668,7 +668,8 @@ static bool srprs_path(const char **ptr, const char* prefix, char sep,
 		return false;
 	}
 	*ppath = path;
-	*ptr = rawmemchr(pos, '\0');
+	/* We know pos ends in '\0'. */
+	*ptr = &pos[strlen(pos)];
 	return true;
 }
 


-- 
Samba Shared Repository