Changeset 454 for trunk/server/source3/lib/ldb

Timestamp:

Jun 4, 2010, 3:11:43 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: merged changes from 3.3

Location:

trunk/server/source3/lib/ldb

Files:

• common/ldb.c (modified) (1 diff)
• ldb_tdb/ldb_tdb.c (modified) (1 diff)

trunk/server/source3/lib/ldb/common/ldb.c

@@ -117 +117 @@
         ldb_connect_fn fn;
 
+#ifndef __OS2__ //  on OS2 we have a semicolon at the second character if w/o backend called
         if (strchr(url, ':') != NULL) {
+#else
+        if (url[1] != ':'  &&  strchr(url, ':') != NULL) {
+#endif
                 backend = talloc_strndup(ldb, url, strchr(url, ':')-url);
         } else {

trunk/server/source3/lib/ldb/ldb_tdb/ldb_tdb.c

@@ -1012 +1012 @@
 
         /* parse the url */
+#ifndef __OS2__ //  on OS2 we have a semicolon at the second character if w/o backend called
         if (strchr(url, ':')) {
+#else
+        if (url[1] != ':'  &&  strchr(url, ':') != NULL) {
+#endif
                 if (strncmp(url, "tdb://", 6) != 0) {
                         ldb_debug(ldb, LDB_DEBUG_ERROR, "Invalid tdb URL '%s'", url);