[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Fri Sep 23 02:59:03 MDT 2011
The branch, master has been updated
via 2a789c8 build: Fix waf build on MacOS X
via d40fe50 build: avoid util.h as a public header name due to conflict with MacOS
from 4383665 python-s4: use PyErr_SetNTSTATUS instead of PyErr_NTSTATUS_IS_ERR_RAISE as it use NT_STATUS_IS_ERROR which is not completely the same as NT_STATUS_IS_OK
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 2a789c8442ce730cac112eeb89c7eb497bb5cc15
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Sep 20 18:19:58 2011 -0700
build: Fix waf build on MacOS X
The -framework CoreFoundation is required by the charset_macosxfs module
The system/time.h header is required to access the replacement clock_gettime()
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet at samba.org>
Autobuild-Date: Fri Sep 23 10:58:02 CEST 2011 on sn-devel-104
commit d40fe50a6755ab701f2fe8a434f1d3331769a4c0
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Sep 20 14:26:36 2011 -0700
build: avoid util.h as a public header name due to conflict with MacOS
-----------------------------------------------------------------------
Summary of changes:
lib/async_req/async_sock.c | 2 +-
lib/crypto/hmacmd5test.c | 2 +-
lib/crypto/md4test.c | 2 +-
lib/crypto/md5test.c | 2 +-
lib/util/charset/charset_macosxfs.c | 2 +-
lib/util/rfc1738.c | 2 +-
lib/util/{util.h => samba_util.h} | 0
lib/util/wscript_build | 4 ++--
librpc/ndr/libndr.h | 2 +-
nsswitch/libwbclient/tests/wbclient.c | 2 +-
source3/include/includes.h | 2 +-
source3/lib/pthreadpool/pthreadpool.c | 3 ++-
source3/lib/server_prefork.c | 2 +-
source4/dsdb/samdb/ldb_modules/descriptor.c | 2 +-
source4/dsdb/samdb/ldb_modules/dirsync.c | 2 +-
source4/dsdb/samdb/ldb_modules/extended_dn_in.c | 2 +-
source4/dsdb/samdb/ldb_modules/extended_dn_out.c | 2 +-
source4/dsdb/samdb/ldb_modules/objectclass.c | 2 +-
source4/dsdb/samdb/ldb_modules/schema.c | 2 +-
source4/dsdb/samdb/ldb_modules/update_keytab.c | 2 +-
source4/dsdb/samdb/ldb_modules/util.c | 2 +-
source4/include/includes.h | 2 +-
source4/lib/policy/gp_ini.c | 2 +-
wscript | 4 ++++
24 files changed, 28 insertions(+), 23 deletions(-)
rename lib/util/{util.h => samba_util.h} (100%)
Changeset truncated at 500 lines:
diff --git a/lib/async_req/async_sock.c b/lib/async_req/async_sock.c
index 3c68a1c..545d213 100644
--- a/lib/async_req/async_sock.c
+++ b/lib/async_req/async_sock.c
@@ -30,7 +30,7 @@
/* Note: lib/util/ is currently GPL */
#include "lib/util/tevent_unix.h"
-#include "lib/util/util.h"
+#include "lib/util/samba_util.h"
#ifndef TALLOC_FREE
#define TALLOC_FREE(ctx) do { talloc_free(ctx); ctx=NULL; } while(0)
diff --git a/lib/crypto/hmacmd5test.c b/lib/crypto/hmacmd5test.c
index a6621a6..a951409 100644
--- a/lib/crypto/hmacmd5test.c
+++ b/lib/crypto/hmacmd5test.c
@@ -17,7 +17,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "replace.h"
-#include "../lib/util/util.h"
+#include "../lib/util/samba_util.h"
#include "../lib/crypto/crypto.h"
struct torture_context;
diff --git a/lib/crypto/md4test.c b/lib/crypto/md4test.c
index 7516e82..4ee05c1 100644
--- a/lib/crypto/md4test.c
+++ b/lib/crypto/md4test.c
@@ -18,7 +18,7 @@
*/
#include "replace.h"
-#include "../lib/util/util.h"
+#include "../lib/util/samba_util.h"
#include "../lib/crypto/crypto.h"
struct torture_context;
diff --git a/lib/crypto/md5test.c b/lib/crypto/md5test.c
index 0457d4d..38e6531 100644
--- a/lib/crypto/md5test.c
+++ b/lib/crypto/md5test.c
@@ -18,7 +18,7 @@
*/
#include "replace.h"
-#include "../lib/util/util.h"
+#include "../lib/util/samba_util.h"
#include "../lib/crypto/crypto.h"
struct torture_context;
diff --git a/lib/util/charset/charset_macosxfs.c b/lib/util/charset/charset_macosxfs.c
index dfd142a..b32aa2b 100644
--- a/lib/util/charset/charset_macosxfs.c
+++ b/lib/util/charset/charset_macosxfs.c
@@ -33,7 +33,7 @@
#include "charset_proto.h"
#undef realloc
-#ifdef DARWIN
+#ifdef DARWINOS
/*
* Include OS frameworks. These are only needed in this module.
diff --git a/lib/util/rfc1738.c b/lib/util/rfc1738.c
index b45310a..c8f0472 100644
--- a/lib/util/rfc1738.c
+++ b/lib/util/rfc1738.c
@@ -50,7 +50,7 @@
#include "includes.h"
-#include "util.h"
+#include "lib/util/samba_util.h"
/*
* RFC 1738 defines that these characters should be escaped, as well
diff --git a/lib/util/util.h b/lib/util/samba_util.h
similarity index 100%
rename from lib/util/util.h
rename to lib/util/samba_util.h
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 553748a..70a639d 100755
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -10,8 +10,8 @@ bld.SAMBA_LIBRARY('samba-util',
server_id.c dprintf.c parmlist.c bitmap.c''',
deps='DYNCONFIG',
public_deps='talloc execinfo uid_wrapper pthread LIBCRYPTO charset',
- public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h string_wrappers.h',
- header_path= [ ('dlinklist.h util.h', '.'), ('*', 'util') ],
+ public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h samba_util.h string_wrappers.h',
+ header_path= [ ('dlinklist.h samba_util.h', '.'), ('*', 'util') ],
local_include=False,
vnum='0.0.1',
pc_files='samba-util.pc'
diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h
index c8edfda..80b0ec9 100644
--- a/librpc/ndr/libndr.h
+++ b/librpc/ndr/libndr.h
@@ -27,7 +27,7 @@
#include <talloc.h>
#include <sys/time.h>
-#include "../lib/util/util.h" /* for discard_const */
+#include "../lib/util/samba_util.h" /* for discard_const */
#include "../lib/util/charset/charset.h"
/*
diff --git a/nsswitch/libwbclient/tests/wbclient.c b/nsswitch/libwbclient/tests/wbclient.c
index 12fc31e..2e1d653 100644
--- a/nsswitch/libwbclient/tests/wbclient.c
+++ b/nsswitch/libwbclient/tests/wbclient.c
@@ -29,7 +29,7 @@
#include "lib/util/charset/charset.h"
#include "libcli/auth/libcli_auth.h"
#include "source4/param/param.h"
-#include "lib/util/util.h"
+#include "lib/util/samba_util.h"
#include "lib/crypto/arcfour.h"
#define WBC_ERROR_EQUAL(x,y) (x == y)
diff --git a/source3/include/includes.h b/source3/include/includes.h
index ac29b7d..b644089 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -498,7 +498,7 @@ typedef char fstring[FSTRING_LEN];
#endif
/* Lists, trees, caching, database... */
-#include "../lib/util/util.h"
+#include "../lib/util/samba_util.h"
#include "../lib/util/util_net.h"
#include "../lib/util/xfile.h"
#include "../lib/util/memory.h"
diff --git a/source3/lib/pthreadpool/pthreadpool.c b/source3/lib/pthreadpool/pthreadpool.c
index 9981ed2..42b550d 100644
--- a/source3/lib/pthreadpool/pthreadpool.c
+++ b/source3/lib/pthreadpool/pthreadpool.c
@@ -17,6 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "config.h"
#include <errno.h>
#include <stdio.h>
#include <unistd.h>
@@ -26,7 +27,7 @@
#include <signal.h>
#include <assert.h>
#include <fcntl.h>
-#include <sys/time.h>
+#include "system/time.h"
#include "pthreadpool.h"
#include "lib/util/dlinklist.h"
diff --git a/source3/lib/server_prefork.c b/source3/lib/server_prefork.c
index a241e24..89600aa 100644
--- a/source3/lib/server_prefork.c
+++ b/source3/lib/server_prefork.c
@@ -25,7 +25,7 @@
#include "system/shmem.h"
#include "system/filesys.h"
#include "server_prefork.h"
-#include "../lib/util/util.h"
+#include "../lib/util/samba_util.h"
#include "../lib/util/tevent_unix.h"
struct prefork_pool {
diff --git a/source4/dsdb/samdb/ldb_modules/descriptor.c b/source4/dsdb/samdb/ldb_modules/descriptor.c
index 4bcb878..9763c8e 100644
--- a/source4/dsdb/samdb/ldb_modules/descriptor.c
+++ b/source4/dsdb/samdb/ldb_modules/descriptor.c
@@ -42,7 +42,7 @@
#include "dsdb/samdb/ldb_modules/schema.h"
#include "auth/auth.h"
#include "param/param.h"
-#include "util.h"
+#include "dsdb/samdb/ldb_modules/util.h"
struct descriptor_data {
int _dummy;
diff --git a/source4/dsdb/samdb/ldb_modules/dirsync.c b/source4/dsdb/samdb/ldb_modules/dirsync.c
index 676aaff..3f22f15 100644
--- a/source4/dsdb/samdb/ldb_modules/dirsync.c
+++ b/source4/dsdb/samdb/ldb_modules/dirsync.c
@@ -27,7 +27,7 @@
#include "librpc/gen_ndr/ndr_drsblobs.h"
#include "librpc/ndr/libndr.h"
#include "dsdb/samdb/samdb.h"
-#include "util.h"
+#include "dsdb/samdb/ldb_modules/util.h"
#define LDAP_DIRSYNC_OBJECT_SECURITY 0x01
#define LDAP_DIRSYNC_ANCESTORS_FIRST_ORDER 0x800
diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn_in.c b/source4/dsdb/samdb/ldb_modules/extended_dn_in.c
index 998634f..541a259 100644
--- a/source4/dsdb/samdb/ldb_modules/extended_dn_in.c
+++ b/source4/dsdb/samdb/ldb_modules/extended_dn_in.c
@@ -34,7 +34,7 @@
#include <ldb_errors.h>
#include <ldb_module.h>
#include "dsdb/samdb/samdb.h"
-#include "util.h"
+#include "dsdb/samdb/ldb_modules/util.h"
/*
TODO: if relax is not set then we need to reject the fancy RMD_* and
diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn_out.c b/source4/dsdb/samdb/ldb_modules/extended_dn_out.c
index 0f37bbe..9e1bec9 100644
--- a/source4/dsdb/samdb/ldb_modules/extended_dn_out.c
+++ b/source4/dsdb/samdb/ldb_modules/extended_dn_out.c
@@ -40,7 +40,7 @@
#include "librpc/gen_ndr/ndr_security.h"
#include "librpc/ndr/libndr.h"
#include "dsdb/samdb/samdb.h"
-#include "util.h"
+#include "dsdb/samdb/ldb_modules/util.h"
struct extended_dn_out_private {
bool dereference;
diff --git a/source4/dsdb/samdb/ldb_modules/objectclass.c b/source4/dsdb/samdb/ldb_modules/objectclass.c
index ab1766f..16a5984 100644
--- a/source4/dsdb/samdb/ldb_modules/objectclass.c
+++ b/source4/dsdb/samdb/ldb_modules/objectclass.c
@@ -46,7 +46,7 @@
#include "param/param.h"
#include "../libds/common/flags.h"
#include "dsdb/samdb/ldb_modules/schema.h"
-#include "util.h"
+#include "dsdb/samdb/ldb_modules/util.h"
struct oc_context {
diff --git a/source4/dsdb/samdb/ldb_modules/schema.c b/source4/dsdb/samdb/ldb_modules/schema.c
index eebe161..51c6a65 100644
--- a/source4/dsdb/samdb/ldb_modules/schema.c
+++ b/source4/dsdb/samdb/ldb_modules/schema.c
@@ -25,7 +25,7 @@
#include "librpc/ndr/libndr.h"
#include "dsdb/samdb/ldb_modules/util.h"
#include "dsdb/samdb/samdb.h"
-#include "util.h"
+#include "dsdb/common/util.h"
#include "libcli/security/security.h"
#include "dsdb/samdb/ldb_modules/schema.h"
diff --git a/source4/dsdb/samdb/ldb_modules/update_keytab.c b/source4/dsdb/samdb/ldb_modules/update_keytab.c
index 81d672b..2d4a903 100644
--- a/source4/dsdb/samdb/ldb_modules/update_keytab.c
+++ b/source4/dsdb/samdb/ldb_modules/update_keytab.c
@@ -34,7 +34,7 @@
#include "auth/credentials/credentials_krb5.h"
#include "system/kerberos.h"
#include "auth/kerberos/kerberos.h"
-#include "util.h"
+#include "dsdb/samdb/ldb_modules/util.h"
struct dn_list {
struct ldb_message *msg;
diff --git a/source4/dsdb/samdb/ldb_modules/util.c b/source4/dsdb/samdb/ldb_modules/util.c
index 48600e7..7f601af 100644
--- a/source4/dsdb/samdb/ldb_modules/util.c
+++ b/source4/dsdb/samdb/ldb_modules/util.c
@@ -26,7 +26,7 @@
#include "librpc/ndr/libndr.h"
#include "dsdb/samdb/ldb_modules/util.h"
#include "dsdb/samdb/samdb.h"
-#include "util.h"
+#include "dsdb/common/util.h"
#include "libcli/security/security.h"
/*
diff --git a/source4/include/includes.h b/source4/include/includes.h
index d0a9702..e60bf90 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -58,7 +58,7 @@
#include "../lib/util/xfile.h"
#include "../lib/util/attr.h"
#include "../lib/util/debug.h"
-#include "../lib/util/util.h"
+#include "../lib/util/samba_util.h"
#include "libcli/util/error.h"
diff --git a/source4/lib/policy/gp_ini.c b/source4/lib/policy/gp_ini.c
index d16011c..da2f5f4 100644
--- a/source4/lib/policy/gp_ini.c
+++ b/source4/lib/policy/gp_ini.c
@@ -18,7 +18,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "includes.h"
-#include "lib/util/util.h"
+#include "lib/util/samba_util.h"
#include "lib/policy/policy.h"
struct gp_parse_context {
diff --git a/wscript b/wscript
index 548f8ec..8454146 100755
--- a/wscript
+++ b/wscript
@@ -77,6 +77,10 @@ def configure(conf):
conf.ADD_CFLAGS('-fno-common')
if not conf.CHECK_SHLIB_W_PYTHON("Checking if -undefined dynamic_lookup is not need"):
conf.env.append_value('shlib_LINKFLAGS', ['-undefined', 'dynamic_lookup'])
+
+ if sys.platform == 'darwin':
+ conf.ADD_LDFLAGS('-framework CoreFoundation')
+
if int(conf.env['PYTHON_VERSION'][0]) >= 3:
raise Utils.WafError('Python version 3.x is not supported by Samba yet')
--
Samba Shared Repository
More information about the samba-cvs
mailing list