Changeset 263 for branches/samba-3.3.x/source

Timestamp:

Jun 12, 2009, 5:09:59 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

ldb init fix (by diver) in 3.3 branch

Location:

branches/samba-3.3.x/source

Files:

• groupdb/mapping_ldb.c (modified) (1 diff)
• lib/ldb/common/ldb.c (modified) (1 diff)
• lib/ldb/ldb_tdb/ldb_tdb.c (modified) (1 diff)
• pkgconfig/netapi.pc (modified) (1 diff)
• pkgconfig/smbclient.pc (modified) (1 diff)
• pkgconfig/smbsharemodes.pc (modified) (1 diff)

branches/samba-3.3.x/source/groupdb/mapping_ldb.c

@@ -81 +81 @@
         /* force the permissions on the ldb to 0600 - this will fix
            existing databases as well as new ones */
+#ifndef __OS2__
         if (chmod(db_path, 0600) != 0) {
                 goto failed;
         }
+#endif
 
         if (!existed) {

branches/samba-3.3.x/source/lib/ldb/common/ldb.c

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

branches/samba-3.3.x/source/lib/ldb/ldb_tdb/ldb_tdb.c

@@ -1012 +1012 @@
 
         /* parse the url */
+//  on OS2 we have a semicolon at the second character if w/o backend called
+#ifndef __OS2__
         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);

branches/samba-3.3.x/source/pkgconfig/netapi.pc

@@ -10 +10 @@
 #Libs: -L${exec_prefix}/lib -lnetapi
 Libs: -lnetapi
-Libs.private: -lnetapi   
+Libs.private: -lnetapi   -lsocket -lsyslog -lurpo
 Cflags: -I${prefix}/include
 

branches/samba-3.3.x/source/pkgconfig/smbclient.pc

@@ -10 +10 @@
 #Libs: -L${exec_prefix}/lib -lsmbclient
 Libs: -lsmbclient
-Libs.private: -lsmbclient   
+Libs.private: -lsmbclient   -lsocket -lsyslog -lurpo
 Cflags: -I${prefix}/include
 

branches/samba-3.3.x/source/pkgconfig/smbsharemodes.pc

@@ -10 +10 @@
 #Libs: -L${exec_prefix}/lib -lsmbsharemodes
 Libs: -lsmbsharemodes
-Libs.private: -lsmbsharemodes   
+Libs.private: -lsmbsharemodes   -lsocket -lsyslog -lurpo
 Cflags: -I${prefix}/include