[SCM] Samba Shared Repository - branch v3-6-test updated
Jeremy Allison
jra at samba.org
Thu Feb 3 12:33:29 MST 2011
The branch, v3-6-test has been updated
via f4bc9df replace: Try to fix broken sys/capabilites.h on Linux.
via 0539d2a Revert "replace: Try to fix broken sys/capabilites.h on Linux."
via e025a21 s3:libnet_dssync_passdb: remove useless DEBUG statements
from 7b30c02 s3-epmap: use correct dcerpc client header in dcerpc_ep.c
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit f4bc9df100f37b69160c50a87009bba43d8f2e35
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Feb 2 10:40:06 2011 +0100
replace: Try to fix broken sys/capabilites.h on Linux.
As this is more or less a broken header we need to include linux/types.h
before sys/capabilities.h to avoid redefinitions.
Systems like ClearOS 5.2 need linux/types.h very early.
metze
Autobuild-User: Stefan Metzmacher <metze at samba.org>
Autobuild-Date: Thu Feb 3 05:26:12 CET 2011 on sn-devel-104
(cherry picked from commit 1e42aa6b3a2912426caebaf89596fa7c9f19ba2e)
commit 0539d2a1a75dcc0a3f20b42890121e71691a00a6
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Feb 3 03:32:21 2011 +0100
Revert "replace: Try to fix broken sys/capabilites.h on Linux."
This reverts commit c2207e9b2cdec9cd4c32184c668a2c469edb7148.
This still doesn't build for me on ClearOS 5.2.
metze
(cherry picked from commit 5f18925e695d0c271aea456a4ee63aeb1e8bbf96)
commit e025a21c604bb854474b84b45bc3d94d05a5dea5
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Feb 3 02:11:41 2011 +0100
s3:libnet_dssync_passdb: remove useless DEBUG statements
metze
Autobuild-User: Stefan Metzmacher <metze at samba.org>
Autobuild-Date: Thu Feb 3 04:20:54 CET 2011 on sn-devel-104
(cherry picked from commit c1c3cb0a237b1ba075e67979f9aad329d6e5914f)
-----------------------------------------------------------------------
Summary of changes:
lib/replace/libreplace.m4 | 2 ++
lib/replace/replace.h | 7 +++++++
lib/replace/system/capability.h | 4 ----
lib/replace/system/config.m4 | 1 -
lib/replace/wscript | 4 ++--
source3/libnet/libnet_dssync_passdb.c | 4 ----
6 files changed, 11 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/libreplace.m4 b/lib/replace/libreplace.m4
index 3dd64ef..24fc5cd 100644
--- a/lib/replace/libreplace.m4
+++ b/lib/replace/libreplace.m4
@@ -89,6 +89,8 @@ AC_INCLUDES_DEFAULT
#endif]
)
+AC_CHECK_HEADERS(linux/types.h)
+
AC_CACHE_CHECK([for working mmap],libreplace_cv_HAVE_MMAP,[
AC_TRY_RUN([#include "$libreplacedir/test/shared_mmap.c"],
libreplace_cv_HAVE_MMAP=yes,libreplace_cv_HAVE_MMAP=no,libreplace_cv_HAVE_MMAP=cross)])
diff --git a/lib/replace/replace.h b/lib/replace/replace.h
index f738658..60aa3d4 100644
--- a/lib/replace/replace.h
+++ b/lib/replace/replace.h
@@ -121,6 +121,13 @@
#include <stddef.h>
#endif
+#ifdef HAVE_LINUX_TYPES_H
+/*
+ * This is needed as some broken header files require this to be included early
+ */
+#include <linux/types.h>
+#endif
+
#ifndef HAVE_STRERROR
extern char *sys_errlist[];
#define strerror(i) sys_errlist[i]
diff --git a/lib/replace/system/capability.h b/lib/replace/system/capability.h
index 832bc29..a7b78f0 100644
--- a/lib/replace/system/capability.h
+++ b/lib/replace/system/capability.h
@@ -37,10 +37,6 @@
#define BROKEN_RHEL5_SYS_CAP_HEADER_WORKAROUND
#endif
-#ifdef HAVE_LINUX_TYPES_H
-#include <linux/types.h>
-#endif
-
#include <sys/capability.h>
#ifdef BROKEN_RHEL5_SYS_CAP_HEADER_WORKAROUND
diff --git a/lib/replace/system/config.m4 b/lib/replace/system/config.m4
index 71d3d53..04364bc 100644
--- a/lib/replace/system/config.m4
+++ b/lib/replace/system/config.m4
@@ -25,7 +25,6 @@ fi
AC_HEADER_SYS_WAIT
# capability
-AC_CHECK_HEADERS(linux/types.h)
AC_CHECK_HEADERS(sys/capability.h)
case "$host_os" in
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 23bb5c3..7e90206 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -37,10 +37,10 @@ def configure(conf):
conf.DEFINE('_OSF_SOURCE', 1, add_to_cflags=True)
conf.DEFINE('_XOPEN_SOURCE', 600, add_to_cflags=True)
- conf.CHECK_HEADERS('crypt.h locale.h acl/libacl.h compat.h')
+ conf.CHECK_HEADERS('linux/types.h crypt.h locale.h acl/libacl.h compat.h')
conf.CHECK_HEADERS('acl/libacl.h attr/xattr.h compat.h ctype.h dustat.h')
conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h')
- conf.CHECK_HEADERS('libaio.h linux/types.h locale.h ndir.h pwd.h')
+ conf.CHECK_HEADERS('libaio.h locale.h ndir.h pwd.h')
conf.CHECK_HEADERS('shadow.h sys/acl.h')
conf.CHECK_HEADERS('sys/attributes.h sys/capability.h sys/dir.h sys/epoll.h')
conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h sys/fs/vx/quota.h')
diff --git a/source3/libnet/libnet_dssync_passdb.c b/source3/libnet/libnet_dssync_passdb.c
index 585428a..4b66c39 100644
--- a/source3/libnet/libnet_dssync_passdb.c
+++ b/source3/libnet/libnet_dssync_passdb.c
@@ -445,8 +445,6 @@ static int dssync_passdb_traverse_gmembers(struct db_record *rec,
state->idx++;
- DEBUG(0,("%s[%u]...\n", state->name, state->idx));
-
group_sid = state->obj->cur->object.identifier->sid;
status = dom_sid_split_rid(talloc_tos(), &group_sid, NULL, &rid);
@@ -568,8 +566,6 @@ static int dssync_passdb_traverse_groups(struct db_record *rec,
return -1;
}
- DEBUG(0,("%s[%u]...\n", state->name, state->idx));
-
obj = dssync_parse_obj(rec->value);
if (obj == NULL) {
return -1;
--
Samba Shared Repository
More information about the samba-cvs
mailing list