r17738: solving the seemingly trivial problem of timegm() being missing on

some systems requires quite a large change in ldb. The core problem is
that ldb doesn't have its own equivalent of lib/replace/, so we have
no sane place to put things like timegm.c

This patch moves part of lib/replace/ from Samba4 into ldb, and the
next patch will remove those parts from Samba4. We will probably need
to similarly move parts of lib/replace/ into lib/talloc/ and lib/tdb/,
so that at each level the libraries have replacements for the
functions they need, but higher level libraries don't need to
re-include replacements if a lower level library already replaces the
function
(This used to be commit c2f6c217fb4a5c84499246480f00df40b0711074)

1 files changed, 2 insertions, 12 deletions

diff --git a/source4/lib/ldb/ldb_tdb/ldb_pack.c b/source4/lib/ldb/ldb_tdb/ldb_pack.c
index b2a004b99f..c6edf663ae 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_pack.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_pack.c
@@ -155,16 +155,6 @@ int ltdb_pack_data(struct ldb_module *module,
 	return 0;
 }
 
-/* using this means we can compile standalone on broken systems like
-   MacOSX 10.4 */
-static size_t ldb_strnlen(const char *s, size_t n)
-{
-	int i;
-	for (i=0; s[i] && i<n; i++)
-		/* noop */ ;
-	return i;
-}
-
 /*
   unpack a ldb message from a linear buffer in TDB_DATA
 
@@ -201,7 +191,7 @@ int ltdb_unpack_data(struct ldb_module *module,
 		break;
 
 	case LTDB_PACKING_FORMAT:
-		len = ldb_strnlen((char *)p, remaining);
+		len = strnlen((char *)p, remaining);
 		if (len == remaining) {
 			errno = EIO;
 			goto failed;
@@ -244,7 +234,7 @@ int ltdb_unpack_data(struct ldb_module *module,
 			errno = EIO;
 			goto failed;
 		}
-		len = ldb_strnlen((char *)p, remaining-6);
+		len = strnlen((char *)p, remaining-6);
 		if (len == remaining-6) {
 			errno = EIO;
 			goto failed;