[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  4f4addd... s4-test: oLschema2ldif doesn't take -H any more
       via  e47e5ff... s4-heimdal: use the HAVE_INET_* functions from libreplace
       via  e310cb3... s4-heimdal: for use of libreplace setegid and seteuid
       via  0f113fa... charset: look for the codepages in the right place
       via  e4c7525... s4-heimdal: a better way of handling dirfd()
      from  0cdc021... selftest: Remove diff-subunit - it's included in subunit and not necessary for normal operation.

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


- Log -----------------------------------------------------------------
commit 4f4adddb171af2fafe280be05fd144fc3ad01107
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue Mar 30 15:36:17 2010 +1100

    s4-test: oLschema2ldif doesn't take -H any more

commit e47e5ff89b8c9b523400d693bcd65454ff8ded85
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue Mar 30 12:08:52 2010 +1100

    s4-heimdal: use the HAVE_INET_* functions from libreplace

commit e310cb3f375faa32d9be0dccfcf03f90eaedfc60
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue Mar 30 00:07:10 2010 +1100

    s4-heimdal: for use of libreplace setegid and seteuid

commit 0f113faea8db91c3890e7ab0edfefedce5ec2594
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue Mar 30 11:55:10 2010 +1100

    charset: look for the codepages in the right place
    
    selftest runs from source3/source4. The codepages when not installed
    are in ../codepages

commit e4c75252a962341c35ef45989ea12c637f7b3a1b
Author: Andrew Tridgell <tridge at samba.org>
Date:   Mon Mar 29 22:47:34 2010 +1100

    s4-heimdal: a better way of handling dirfd()
    
    This prevents us getting thousands of warnings about dirfd() on
    solaris

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

Summary of changes:
 lib/util/charset/codepoints.c                      |    4 +-
 source4/heimdal_build/config.h                     |    4 ---
 source4/heimdal_build/roken.h                      |   25 ++++++++++++++++++++
 source4/scripting/python/samba/provisionbackend.py |    2 +-
 4 files changed, 28 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/util/charset/codepoints.c b/lib/util/charset/codepoints.c
index a940c1b..8be2051 100644
--- a/lib/util/charset/codepoints.c
+++ b/lib/util/charset/codepoints.c
@@ -49,14 +49,14 @@ void load_case_tables(void)
 	talloc_free(mem_ctx);
 	if (upcase_table == NULL) {
 		/* try also under codepages for testing purposes */
-		upcase_table = map_file("codepages/upcase.dat", 0x20000);
+		upcase_table = map_file("../codepages/upcase.dat", 0x20000);
 		if (upcase_table == NULL) {
 			upcase_table = (void *)-1;
 		}
 	}
 	if (lowcase_table == NULL) {
 		/* try also under codepages for testing purposes */
-		lowcase_table = map_file("codepages/lowcase.dat", 0x20000);
+		lowcase_table = map_file("../codepages/lowcase.dat", 0x20000);
 		if (lowcase_table == NULL) {
 			lowcase_table = (void *)-1;
 		}
diff --git a/source4/heimdal_build/config.h b/source4/heimdal_build/config.h
index be544cb..35981b8 100644
--- a/source4/heimdal_build/config.h
+++ b/source4/heimdal_build/config.h
@@ -9,10 +9,6 @@
 #include "include/config.h"
 #include "../replace/replace.h"
 
-#if !defined(HAVE_DIRFD) && !defined(HAVE_DIRFD_DECL) && !defined(dirfd)
-#define dirfd(d) (-1)
-#endif
-
 #define RCSID(msg) struct __rcsid { int __rcsdi; }
 #define KRB5
 
diff --git a/source4/heimdal_build/roken.h b/source4/heimdal_build/roken.h
index 172dc76..68d80f1 100644
--- a/source4/heimdal_build/roken.h
+++ b/source4/heimdal_build/roken.h
@@ -107,10 +107,26 @@
 #define HAVE_INET_ATON
 #endif
 
+#ifndef HAVE_INET_NTOP
+#define HAVE_INET_NTOP
+#endif
+
+#ifndef HAVE_INET_PTON
+#define HAVE_INET_PTON
+#endif
+
 #ifndef HAVE_GETTIMEOFDAY
 #define HAVE_GETTIMEOFDAY
 #endif
 
+#ifndef HAVE_SETEGID
+#define HAVE_SETEGID
+#endif
+
+#ifndef HAVE_SETEUID
+#define HAVE_SETEUID
+#endif
+
 /* force the use of the libreplace strerror_r */
 #ifndef HAVE_STRERROR_R
 #define HAVE_STRERROR_R
@@ -119,6 +135,15 @@
 #define STRERROR_R_PROTO_COMPATIBLE
 #endif
 
+#ifndef HAVE_DIRFD
+#ifdef HAVE_DIR_DD_FD
+#define dirfd(x) ((x)->dd_fd)
+#else
+#define dirfd(d) (-1)
+#endif
+#define HAVE_DIRFD 1
+#endif
+
 
 /* we lie about having pidfile() so that NetBSD5 can compile. Nothing
    in the parts of heimdal we use actually uses pidfile(), and we
diff --git a/source4/scripting/python/samba/provisionbackend.py b/source4/scripting/python/samba/provisionbackend.py
index e510486..479d965 100644
--- a/source4/scripting/python/samba/provisionbackend.py
+++ b/source4/scripting/python/samba/provisionbackend.py
@@ -582,7 +582,7 @@ class FDSBackend(LDAPBackend):
         self.samba3_schema = self.setup_path("../../examples/LDAP/samba.schema")
         self.samba3_ldif = os.path.join(self.ldapdir, "samba3.ldif")
 
-        self.retcode = subprocess.call(["bin/oLschema2ldif", "-H", "NONE",
+        self.retcode = subprocess.call(["bin/oLschema2ldif", 
                 "-I", self.samba3_schema,
                 "-O", self.samba3_ldif,
                 "-b", self.names.domaindn],


-- 
Samba Shared Repository