diff options
| -rw-r--r-- | lib/socket_wrapper/wscript | 2 | ||||
| -rw-r--r-- | lib/socket_wrapper/wscript_build | 2 | ||||
| -rw-r--r-- | lib/tdb/include/tdb.h | 1 | ||||
| -rw-r--r-- | lib/tdb/tdb.exports | 1 | ||||
| -rw-r--r-- | lib/tdb/tdb.signatures | 1 | ||||
| -rw-r--r-- | source3/wscript_build | 7 | ||||
| -rw-r--r-- | source4/torture/local/wscript_build | 2 |
7 files changed, 9 insertions, 7 deletions
diff --git a/lib/socket_wrapper/wscript b/lib/socket_wrapper/wscript index 9afd115eb2..70474d7513 100644 --- a/lib/socket_wrapper/wscript +++ b/lib/socket_wrapper/wscript @@ -11,5 +11,5 @@ def set_options(opt): def configure(conf): if (Options.options.enable_socket_wrapper or Options.options.developer or Options.options.enable_selftest): conf.DEFINE('SOCKET_WRAPPER', 1) - conf.ADD_GLOBAL_DEPENDENCY('SOCKET_WRAPPER') + conf.ADD_GLOBAL_DEPENDENCY('socket_wrapper') diff --git a/lib/socket_wrapper/wscript_build b/lib/socket_wrapper/wscript_build index a3546a0e22..e100ccc6fe 100644 --- a/lib/socket_wrapper/wscript_build +++ b/lib/socket_wrapper/wscript_build @@ -1,6 +1,6 @@ #!/usr/bin/env python -bld.SAMBA_LIBRARY('SOCKET_WRAPPER', +bld.SAMBA_LIBRARY('socket_wrapper', source='socket_wrapper.c', group='base_libraries', private_library=True, diff --git a/lib/tdb/include/tdb.h b/lib/tdb/include/tdb.h index 115c6fada6..38d819733a 100644 --- a/lib/tdb/include/tdb.h +++ b/lib/tdb/include/tdb.h @@ -101,6 +101,7 @@ void tdb_set_max_dead(struct tdb_context *tdb, int max_dead); int tdb_reopen(struct tdb_context *tdb); int tdb_reopen_all(int parent_longlived); +__attribute__((deprecated)) void tdb_logging_function(struct tdb_context *tdb, tdb_log_func); void tdb_set_logging_function(struct tdb_context *tdb, const struct tdb_logging_context *log_ctx); enum TDB_ERROR tdb_error(struct tdb_context *tdb); const char *tdb_errorstr(struct tdb_context *tdb); diff --git a/lib/tdb/tdb.exports b/lib/tdb/tdb.exports index 73b8fd634c..09b9a96964 100644 --- a/lib/tdb/tdb.exports +++ b/lib/tdb/tdb.exports @@ -23,6 +23,7 @@ tdb_freelist_size; tdb_get_flags; tdb_get_logging_private; + tdb_logging_function; tdb_get_seqnum; tdb_hash_size; tdb_increment_seqnum_nonblock; diff --git a/lib/tdb/tdb.signatures b/lib/tdb/tdb.signatures index 7706d1866a..1201077786 100644 --- a/lib/tdb/tdb.signatures +++ b/lib/tdb/tdb.signatures @@ -56,6 +56,7 @@ void tdb_increment_seqnum_nonblock (struct tdb_context *); void tdb_remove_flags (struct tdb_context *, unsigned int); void tdb_setalarm_sigptr (struct tdb_context *, volatile sig_atomic_t *); void tdb_set_logging_function (struct tdb_context *, const struct tdb_logging_context *); +void tdb_logging_function(struct tdb_context *tdb, tdb_log_func); void tdb_set_max_dead (struct tdb_context *, int); int tdb_check (struct tdb_context *, int (*) (TDB_DATA, TDB_DATA, void *), void *); TDB_DATA tdb_null; diff --git a/source3/wscript_build b/source3/wscript_build index e08218f435..7516f7ac05 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -959,7 +959,6 @@ bld.SAMBA_LIBRARY('libsmbsharemodes', bld.SAMBA_LIBRARY('libaddns', source=LIBADDNS_SRC, - deps='SOCKET_WRAPPER', public_deps='talloc krb5 k5crypto com_err gssapi gssapi_krb5', private_library=True, vars=locals()) @@ -1121,7 +1120,7 @@ bld.SAMBA_SUBSYSTEM('SMBD_BASE', PARAM_WITHOUT_REG LIBS LIBSMB POPT_SAMBA KRBCLIENT AVAHI LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER LIBADS_PRINTER vfs vfs_default vfs_posixacl auth rpc LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE - PRINTING PRINTBACKEND NDR_XATTR REGFIO SOCKET_WRAPPER + PRINTING PRINTBACKEND NDR_XATTR REGFIO LIBSMBCONF REG_FULL ''', vars=locals()) @@ -1287,7 +1286,7 @@ bld.SAMBA_BINARY('smbclient', source=CLIENT_SRC, deps='''talloc tdb cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD PARAM_WITHOUT_REG libwbclient PARAM KRBCLIENT LIBMSRPC_GEN - LIBMSRPC SMBREADLINE SOCKET_WRAPPER''', + LIBMSRPC SMBREADLINE''', vars=locals()) bld.SAMBA_BINARY('net', @@ -1361,7 +1360,7 @@ bld.SAMBA_BINARY('smbget', bld.SAMBA_BINARY('nmblookup', source=NMBLOOKUP_SRC, - deps='''talloc tdb tevent cap resolv PARAM LIB_NONSMBD POPT_SAMBA LIBSMB_ERR SOCKET_WRAPPER''', + deps='''talloc tdb tevent cap resolv PARAM LIB_NONSMBD POPT_SAMBA LIBSMB_ERR''', vars=locals()) bld.SAMBA_BINARY('smbtorture', diff --git a/source4/torture/local/wscript_build b/source4/torture/local/wscript_build index 3c3c76e5c2..f24402a55c 100644 --- a/source4/torture/local/wscript_build +++ b/source4/torture/local/wscript_build @@ -5,6 +5,6 @@ bld.SAMBA_MODULE('TORTURE_LOCAL', autoproto='proto.h', subsystem='smbtorture', init_function='torture_local_init', - deps='RPC_NDR_ECHO TDR LIBCLI_SMB MESSAGING iconv POPT_CREDENTIALS TORTURE_AUTH TORTURE_UTIL TORTURE_NDR TORTURE_LIBCRYPTO share torture_registry PROVISION NSS_WRAPPER ldb SAMDB SOCKET_WRAPPER', + deps='RPC_NDR_ECHO TDR LIBCLI_SMB MESSAGING iconv POPT_CREDENTIALS TORTURE_AUTH TORTURE_UTIL TORTURE_NDR TORTURE_LIBCRYPTO share torture_registry PROVISION NSS_WRAPPER ldb SAMDB', internal_module=True ) |