[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Wed Jan 13 06:48:03 UTC 2016
The branch, master has been updated
via da8674c Rename 'errors' to 'samba-errors' and make it public.
via 218f96f libcli: Make headers for private libraries private.
via ffbd9c4 Add a new header file for functions in lib/util/util.c.
via 512d15d Make libcli-smb-raw private, for now.
via 773cfba Avoid including libds/common/roles.h in public loadparm.h header.
via ce32f26 ldb: Only set public headers field when installing as a public library.
via 1860e98 time_basic.h: Remove unnecessary dependency on replace.h
via 620d5cb Remove public library dcerpc-atsvc.
via 232726a Make libregistry private, for now.
via 2f7dde3 Make libtorture private, for now.
via c46a8cf Make gensec private, for now.
via 5d67d55 talloc: Only set public headers field when installing as a public library.
via 3eb9065 Error when private libraries have public headers.
via 68a3576 tdb: Only set public headers field when installing as a public library.
via 48ebeaa Add private_headers flag to SAMBA_*() functions.
via 2cba491 tevent: Only set public headers field when installing as a public library.
via fddca39 samdb: Add explicit dependency on ldb.
via 3123e2c Simplify handling of dependencies on external libraries in test_headers.
via 4ab7a00 Use full path to dlinklist.h in includes.
from 6f3656c Revert "winbind: Retry after SESSION_EXPIRED error in ping-dc"
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit da8674c72ab1f2dc8458434d714c61530630f51e
Author: Jelmer Vernooij <jelmer at jelmer.uk>
Date: Mon Jan 4 01:01:53 2016 +0000
Rename 'errors' to 'samba-errors' and make it public.
This is necessary because it has public headers.
Signed-off-by: Jelmer Vernooij <jelmer at jelmer.uk>
Reviewed-By: Andrew Bartlett <abartlet at samba.org>
Reviewed-By: Stefan Metzmacher <metze at samba.org>
Autobuild-User(master): Jelmer Vernooij <jelmer at samba.org>
Autobuild-Date(master): Wed Jan 13 07:47:04 CET 2016 on sn-devel-144
commit 218f96f2bf10f7f03ec964c4515f6e248fc31ad8
Author: Jelmer Vernooij <jelmer at jelmer.uk>
Date: Mon Jan 4 00:56:10 2016 +0000
libcli: Make headers for private libraries private.
Signed-off-by: Jelmer Vernooij <jelmer at jelmer.uk>
Reviewed-By: Andrew Bartlett <abartlet at samba.org>
Reviewed-By: Stefan Metzmacher <metze at samba.org>
commit ffbd9c4584d83c56e58901bc91effa75ebdcbb02
Author: Jelmer Vernooij <jelmer at jelmer.uk>
Date: Mon Dec 28 22:21:11 2015 +0000
Add a new header file for functions in lib/util/util.c.
This allows public headers to not include samba_util.h, but rather
specific header files under lib/util.
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
Reviewed-By: Andrew Bartlett <abartlet at samba.org>
Reviewed-By: Stefan Metzmacher <metze at samba.org>
commit 512d15de56ed3f5a0abf9a7b98934ed42f211306
Author: Jelmer Vernooij <jelmer at jelmer.uk>
Date: Mon Dec 28 22:19:21 2015 +0000
Make libcli-smb-raw private, for now.
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
Reviewed-By: Andrew Bartlett <abartlet at samba.org>
Reviewed-By: Stefan Metzmacher <metze at samba.org>
commit 773cfba9af34e64b96e843b1b60afa5a0b0dec32
Author: Jelmer Vernooij <jelmer at jelmer.uk>
Date: Mon Dec 28 19:01:54 2015 +0000
Avoid including libds/common/roles.h in public loadparm.h header.
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
Reviewed-By: Andrew Bartlett <abartlet at samba.org>
Reviewed-By: Stefan Metzmacher <metze at samba.org>
commit ce32f26647391df0e088b8850f5afc1120190a72
Author: Jelmer Vernooij <jelmer at jelmer.uk>
Date: Mon Dec 28 18:57:26 2015 +0000
ldb: Only set public headers field when installing as a public library.
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
Reviewed-By: Andrew Bartlett <abartlet at samba.org>
Reviewed-By: Stefan Metzmacher <metze at samba.org>
commit 1860e98d31fc85f02e57cb9d035d664321f90db3
Author: Jelmer Vernooij <jelmer at jelmer.uk>
Date: Mon Jan 4 01:07:27 2016 +0000
time_basic.h: Remove unnecessary dependency on replace.h
Forward declare struct timeval
Signed-off-by: Jelmer Vernooij <jelmer at jelmer.uk>
Reviewed-By: Andrew Bartlett <abartlet at samba.org>
Reviewed-By: Stefan Metzmacher <metze at samba.org>
commit 620d5cbe1705fa5787b865ea469ac0688ab0cfeb
Author: Jelmer Vernooij <jelmer at jelmer.uk>
Date: Thu Jan 28 15:21:21 2016 +0000
Remove public library dcerpc-atsvc.
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
Reviewed-By: Andrew Bartlett <abartlet at samba.org>
Reviewed-By: Stefan Metzmacher <metze at samba.org>
commit 232726a4b414ff1a51e454545bca58052400316b
Author: Jelmer Vernooij <jelmer at jelmer.uk>
Date: Thu Jan 28 15:21:21 2016 +0000
Make libregistry private, for now.
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
Reviewed-By: Andrew Bartlett <abartlet at samba.org>
Reviewed-By: Stefan Metzmacher <metze at samba.org>
commit 2f7dde3af769fb367679f42494d30c298adacfec
Author: Jelmer Vernooij <jelmer at jelmer.uk>
Date: Thu Jan 28 15:21:21 2016 +0000
Make libtorture private, for now.
Signed-Off-By: Jelmer Vernooij <jelmer at jelmer.uk>
Reviewed-By: Andrew Bartlett <abartlet at samba.org>
Reviewed-By: Stefan Metzmacher <metze at samba.org>
commit c46a8cf258bec3ae0300493ad7ca61b356945dac
Author: Jelmer Vernooij <jelmer at jelmer.uk>
Date: Thu Jan 28 15:21:21 2016 +0000
Make gensec private, for now.
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
Reviewed-By: Andrew Bartlett <abartlet at samba.org>
Reviewed-By: Stefan Metzmacher <metze at samba.org>
commit 5d67d555f0ecdbc92e83dbccc4b6f0539cb1395f
Author: Jelmer Vernooij <jelmer at jelmer.uk>
Date: Mon Jan 4 15:21:21 2016 +0000
talloc: Only set public headers field when installing as a public library.
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
commit 3eb90650a8aba68305e5c0b32c83be268c122b0e
Author: Jelmer Vernooij <jelmer at jelmer.uk>
Date: Mon Dec 28 00:04:02 2015 +0000
Error when private libraries have public headers.
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
Reviewed-By: Andrew Bartlett <abartlet at samba.org>
Reviewed-By: Stefan Metzmacher <metze at samba.org>
commit 68a3576629d48eea851a4c048208a4ee4b6e2aa7
Author: Jelmer Vernooij <jelmer at jelmer.uk>
Date: Mon Jan 4 15:21:02 2016 +0000
tdb: Only set public headers field when installing as a public library.
Signed-Off-By: Jelmer Vernooij <Jelmer at samba.org>
commit 48ebeaa4aa5bab0bf1692d18a57f84ea97ca436b
Author: Jelmer Vernooij <jelmer at jelmer.uk>
Date: Sun Dec 27 22:07:59 2015 +0000
Add private_headers flag to SAMBA_*() functions.
While this argument is correctly ignored, it does mean that we can
associate private headers with specific subsystems/libraries.
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
Reviewed-By: Andrew Bartlett <abartlet at samba.org>
Reviewed-By: Stefan Metzmacher <metze at samba.org>
commit 2cba4918dbe82fb9d0455c73d35aa551dccc924f
Author: Jelmer Vernooij <jelmer at jelmer.uk>
Date: Mon Jan 4 23:01:26 2016 +0000
tevent: Only set public headers field when installing as a public library.
Signed-off-by: Jelmer Vernooij <jelmer at jelmer.uk>
commit fddca39f1949bdfab89077de20d09a426ee34043
Author: Jelmer Vernooij <jelmer at jelmer.uk>
Date: Tue Jan 5 23:11:08 2016 +0000
samdb: Add explicit dependency on ldb.
This is needed to pull in the right -I flags.
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
commit 3123e2c66a29aaabad7408107bcf4a0e841a93ec
Author: Jelmer Vernooij <jelmer at jelmer.uk>
Date: Sat Jan 9 20:25:17 2016 +0000
Simplify handling of dependencies on external libraries in test_headers.
Signed-off-by: Jelmer Vernooij <jelmer at jelmer.uk>
commit 4ab7a00ac4f74df42baf9c6b5367421bf7794aed
Author: Jelmer Vernooij <jelmer at jelmer.uk>
Date: Sat Jan 9 21:55:53 2016 +0000
Use full path to dlinklist.h in includes.
Signed-off-by: Jelmer Vernooij <jelmer at jelmer.uk>
-----------------------------------------------------------------------
Summary of changes:
auth/credentials/wscript_build | 2 +-
auth/gensec/gensec.pc.in | 11 -----
auth/gensec/wscript_build | 7 ++-
auth/ntlmssp/gensec_ntlmssp_server.c | 1 +
buildtools/wafsamba/wafsamba.py | 11 ++++-
dfs_server/dfs_server_ad.c | 1 +
lib/dbwrap/wscript_build | 2 +-
lib/ldb-samba/wscript_build | 2 +-
lib/ldb/wscript | 8 ++--
lib/param/loadparm.c | 1 +
lib/param/param.h | 2 -
lib/param/param_table.c | 1 +
lib/param/util.c | 1 +
lib/talloc/wscript | 4 +-
lib/tdb/wscript | 2 +-
lib/tevent/wscript | 2 +-
lib/torture/torture.pc.in | 12 -----
lib/torture/wscript_build | 11 ++---
lib/util/samba_util.h | 31 +------------
lib/util/time_basic.c | 1 +
lib/util/time_basic.h | 3 +-
lib/util/util.h | 53 ++++++++++++++++++++++
lib/util/wscript_build | 7 ++-
libcli/auth/netlogon_creds_cli.c | 1 +
libcli/auth/wscript_build | 2 +-
libcli/drsuapi/wscript_build | 2 +-
libcli/ldap/wscript_build | 7 ++-
libcli/nbt/libnbt.h | 2 +
libcli/smb/wscript | 6 +--
libcli/util/wscript_build | 6 ++-
libds/common/wscript_build | 6 +--
librpc/ndr/libndr.h | 6 ++-
librpc/ndr/ndr_basic.c | 1 +
librpc/rpc/rpc_common.h | 1 +
librpc/tools/wscript_build | 2 +-
librpc/wscript_build | 4 +-
source3/lib/poll_funcs/poll_funcs_tevent.c | 2 +-
source3/lib/unix_msg/unix_msg.c | 2 +-
source3/wscript_build | 2 +-
source4/auth/kerberos/wscript_build | 2 +-
source4/auth/ntlm/auth.c | 1 +
source4/auth/ntlm/auth_sam.c | 1 +
source4/cldap_server/cldap_server.c | 1 +
source4/dns_server/dns_server.c | 1 +
source4/dns_server/wscript_build | 2 +-
source4/dsdb/dns/dns_update.c | 1 +
source4/dsdb/kcc/kcc_service.c | 1 +
source4/dsdb/repl/drepl_service.c | 1 +
source4/dsdb/samdb/ldb_modules/dns_notify.c | 2 +-
source4/dsdb/wscript_build | 4 +-
source4/echo_server/echo_server.c | 1 +
source4/kdc/kdc.c | 1 +
source4/ldap_server/ldap_server.c | 1 +
source4/lib/registry/registry.pc.in | 12 -----
source4/lib/registry/wscript_build | 5 +-
source4/lib/socket/wscript_build | 2 +-
source4/libcli/ldap/wscript_build | 4 +-
source4/libcli/raw/smbclient-raw.pc.in | 10 ----
source4/libcli/smb2/wscript_build | 2 +-
source4/libcli/wbclient/wscript_build | 2 +-
source4/libcli/wscript_build | 14 +++---
source4/librpc/dcerpc_atsvc.pc.in | 11 -----
source4/librpc/wscript_build | 18 +-------
source4/nbt_server/dgram/netlogon.c | 1 +
source4/nbt_server/register.c | 1 +
source4/param/tests/loadparm.c | 1 +
.../backupkey/dcesrv_backupkey_heimdal.c | 1 +
source4/rpc_server/common/server_info.c | 1 +
source4/rpc_server/lsa/dcesrv_lsa.c | 1 +
source4/rpc_server/samr/dcesrv_samr.h | 1 +
source4/smbd/server.c | 1 +
source4/torture/drs/wscript_build | 2 +-
source4/torture/raw/session.c | 2 +-
source4/torture/wscript_build | 4 +-
testsuite/headers/wscript_build | 13 +-----
75 files changed, 169 insertions(+), 188 deletions(-)
delete mode 100644 auth/gensec/gensec.pc.in
delete mode 100644 lib/torture/torture.pc.in
create mode 100644 lib/util/util.h
delete mode 100644 source4/lib/registry/registry.pc.in
delete mode 100644 source4/libcli/raw/smbclient-raw.pc.in
delete mode 100644 source4/librpc/dcerpc_atsvc.pc.in
Changeset truncated at 500 lines:
diff --git a/auth/credentials/wscript_build b/auth/credentials/wscript_build
index 06d58a7..009f5ec 100755
--- a/auth/credentials/wscript_build
+++ b/auth/credentials/wscript_build
@@ -5,7 +5,7 @@ bld.SAMBA_LIBRARY('samba-credentials',
autoproto='credentials_proto.h',
public_headers='credentials.h',
pc_files='samba-credentials.pc',
- deps='LIBCRYPTO errors events LIBCLI_AUTH samba-security CREDENTIALS_SECRETS CREDENTIALS_KRB5',
+ deps='LIBCRYPTO samba-errors events LIBCLI_AUTH samba-security CREDENTIALS_SECRETS CREDENTIALS_KRB5',
vnum='0.0.1'
)
diff --git a/auth/gensec/gensec.pc.in b/auth/gensec/gensec.pc.in
deleted file mode 100644
index f32226d..0000000
--- a/auth/gensec/gensec.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-modulesdir=${prefix}/modules/gensec
-
-Name: gensec
-Description: Generic Security Library
-Version: @PACKAGE_VERSION@
-Libs: @LIB_RPATH@ -L${libdir} -lgensec
-Cflags: -I${includedir} -DHAVE_IMMEDIATE_STRUCTURES=1
diff --git a/auth/gensec/wscript_build b/auth/gensec/wscript_build
index e4c4a08..d8299be 100755
--- a/auth/gensec/wscript_build
+++ b/auth/gensec/wscript_build
@@ -1,12 +1,11 @@
#!/usr/bin/env python
bld.SAMBA_LIBRARY('gensec',
source='gensec.c gensec_start.c gensec_util.c',
- pc_files='gensec.pc',
autoproto='gensec_toplevel_proto.h',
- public_deps='tevent-util samba-util errors auth_system_session samba-modules gensec_util asn1util',
- public_headers='gensec.h',
+ public_deps='tevent-util samba-util samba-errors auth_system_session samba-modules gensec_util asn1util',
+ private_headers='gensec.h',
deps='com_err',
- vnum='0.0.1'
+ private_library=True,
)
bld.SAMBA_MODULE('gensec_spnego',
diff --git a/auth/ntlmssp/gensec_ntlmssp_server.c b/auth/ntlmssp/gensec_ntlmssp_server.c
index 69c56fb..03d539b 100644
--- a/auth/ntlmssp/gensec_ntlmssp_server.c
+++ b/auth/ntlmssp/gensec_ntlmssp_server.c
@@ -34,6 +34,7 @@
#include "auth/gensec/gensec_internal.h"
#include "auth/common_auth.h"
#include "param/param.h"
+#include "libds/common/roles.h"
/**
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 8af8455..4a47dbf 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -106,6 +106,7 @@ def SAMBA_LIBRARY(bld, libname, source,
includes='',
public_headers=None,
public_headers_install=True,
+ private_headers=None,
header_path=None,
pc_files=None,
vnum=None,
@@ -145,8 +146,12 @@ def SAMBA_LIBRARY(bld, libname, source,
if pyembed and bld.env['IS_EXTRA_PYTHON']:
public_headers = pc_files = None
+ if private_library and public_headers:
+ raise Utils.WafError("private library '%s' must not have public header files" %
+ libname)
+
if LIB_MUST_BE_PRIVATE(bld, libname):
- private_library=True
+ private_library = True
if not enabled:
SET_TARGET_TYPE(bld, libname, 'DISABLED')
@@ -187,6 +192,7 @@ def SAMBA_LIBRARY(bld, libname, source,
includes = includes,
public_headers = public_headers,
public_headers_install = public_headers_install,
+ private_headers= private_headers,
header_path = header_path,
cflags = cflags,
group = subsystem_group,
@@ -337,6 +343,7 @@ def SAMBA_BINARY(bld, binname, source,
deps='',
includes='',
public_headers=None,
+ private_headers=None,
header_path=None,
modules=None,
ldflags=None,
@@ -539,6 +546,7 @@ def SAMBA_SUBSYSTEM(bld, modname, source,
includes='',
public_headers=None,
public_headers_install=True,
+ private_headers=None,
header_path=None,
cflags='',
cflags_end=None,
@@ -631,6 +639,7 @@ def SAMBA_GENERATOR(bld, name, rule, source='', target='',
group='generators', enabled=True,
public_headers=None,
public_headers_install=True,
+ private_headers=None,
header_path=None,
vars=None,
dep_vars=[],
diff --git a/dfs_server/dfs_server_ad.c b/dfs_server/dfs_server_ad.c
index 3a25dff..04aa7e0 100644
--- a/dfs_server/dfs_server_ad.c
+++ b/dfs_server/dfs_server_ad.c
@@ -27,6 +27,7 @@
#include "lib/tsocket/tsocket.h"
#include "dfs_server/dfs_server_ad.h"
#include "lib/util/util_net.h"
+#include "libds/common/roles.h"
#define MAX_DFS_RESPONSE 56*1024 /* 56 Kb */
diff --git a/lib/dbwrap/wscript_build b/lib/dbwrap/wscript_build
index 195ad4e..b719a60 100644
--- a/lib/dbwrap/wscript_build
+++ b/lib/dbwrap/wscript_build
@@ -1,6 +1,6 @@
SRC = '''dbwrap.c dbwrap_util.c dbwrap_rbt.c dbwrap_cache.c dbwrap_tdb.c
dbwrap_local_open.c'''
-DEPS= '''samba-util util_tdb errors tdb tdb-wrap samba-hostconfig'''
+DEPS= '''samba-util util_tdb samba-errors tdb tdb-wrap samba-hostconfig'''
bld.SAMBA_LIBRARY('dbwrap',
source=SRC,
diff --git a/lib/ldb-samba/wscript_build b/lib/ldb-samba/wscript_build
index 7016b2f..2d9d700 100644
--- a/lib/ldb-samba/wscript_build
+++ b/lib/ldb-samba/wscript_build
@@ -8,7 +8,7 @@ bld.SAMBA_LIBRARY('ldbsamba',
source='ldif_handlers.c',
autoproto='ldif_handlers_proto.h',
public_deps='ldb',
- deps='samba-security ndr NDR_DRSBLOBS NDR_DNSP ldbwrap samdb-common SAMDB_SCHEMA tdb errors',
+ deps='samba-security ndr NDR_DRSBLOBS NDR_DNSP ldbwrap samdb-common SAMDB_SCHEMA tdb samba-errors',
private_library=True
)
diff --git a/lib/ldb/wscript b/lib/ldb/wscript
index 6ff0c7c..b7dd4aa 100755
--- a/lib/ldb/wscript
+++ b/lib/ldb/wscript
@@ -127,7 +127,7 @@ def build(bld):
bld.SAMBA_LIBRARY(name,
deps='ldb',
source='pyldb_util.c',
- public_headers='pyldb.h',
+ public_headers=('' if private_library else 'pyldb.h'),
public_headers_install=not private_library,
vnum=VERSION,
private_library=private_library,
@@ -159,12 +159,14 @@ def build(bld):
abi_match = '!ldb_*module_ops !ldb_*backend_ops ldb_*'
+ ldb_headers = ('include/ldb.h include/ldb_errors.h '
+ 'include/ldb_module.h include/ldb_handlers.h')
+
bld.SAMBA_LIBRARY('ldb',
COMMON_SRC + ' ' + LDB_MAP_SRC,
deps='tevent LIBLDB_MAIN replace',
includes='include',
- public_headers='include/ldb.h include/ldb_errors.h '\
- 'include/ldb_module.h include/ldb_handlers.h',
+ public_headers=('' if private_library else ldb_headers),
public_headers_install=not private_library,
pc_files='ldb.pc',
vnum=VERSION,
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 6a27dcb..e5e3a30 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -68,6 +68,7 @@
#include "libcli/smb/smb_constants.h"
#include "tdb.h"
#include "librpc/gen_ndr/nbt.h"
+#include "libds/common/roles.h"
#ifdef HAVE_HTTPCONNECTENCRYPT
#include <cups/http.h>
diff --git a/lib/param/param.h b/lib/param/param.h
index 25be9dd..500f52d 100644
--- a/lib/param/param.h
+++ b/lib/param/param.h
@@ -39,8 +39,6 @@ struct smbsrv_connection;
#define Auto (2)
-#include "libds/common/roles.h"
-
struct loadparm_context;
struct loadparm_service;
struct smbcli_options;
diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 92a7619..1ebb2f8 100644
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -32,6 +32,7 @@
#include "lib/param/loadparm.h"
#include "lib/param/param_global.h"
#include "libcli/smb/smb_constants.h"
+#include "libds/common/roles.h"
#ifndef N_
#define N_(x) x
diff --git a/lib/param/util.c b/lib/param/util.c
index 7e4232d..bf9e0b8 100644
--- a/lib/param/util.c
+++ b/lib/param/util.c
@@ -28,6 +28,7 @@
#include "system/filesys.h"
#include "system/dir.h"
#include "param/param.h"
+#include "libds/common/roles.h"
/**
* @file
diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index b288071..1616791 100644
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -116,7 +116,7 @@ def build(bld):
abi_match='talloc* _talloc*',
hide_symbols=True,
vnum=VERSION,
- public_headers='talloc.h',
+ public_headers=('' if private_library else 'talloc.h'),
pc_files='talloc.pc',
public_headers_install=not private_library,
private_library=private_library,
@@ -135,7 +135,7 @@ def build(bld):
abi_directory='ABI',
abi_match='pytalloc_*',
private_library=private_library,
- public_headers='pytalloc.h',
+ public_headers=('' if private_library else 'pytalloc.h'),
pc_files='pytalloc-util.pc'
)
bld.SAMBA_PYTHON('pytalloc',
diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index c47c37a..e5c0ead 100644
--- a/lib/tdb/wscript
+++ b/lib/tdb/wscript
@@ -138,7 +138,7 @@ def build(bld):
abi_match='tdb_*',
hide_symbols=True,
vnum=VERSION,
- public_headers='include/tdb.h',
+ public_headers=('' if private_library else 'include/tdb.h'),
public_headers_install=not private_library,
pc_files='tdb.pc',
private_library=private_library)
diff --git a/lib/tevent/wscript b/lib/tevent/wscript
index 73871d8..103cc06 100755
--- a/lib/tevent/wscript
+++ b/lib/tevent/wscript
@@ -107,7 +107,7 @@ def build(bld):
abi_directory='ABI',
abi_match='tevent_* _tevent_*',
vnum=VERSION,
- public_headers='tevent.h',
+ public_headers=('' if private_library else 'tevent.h'),
public_headers_install=not private_library,
pc_files='tevent.pc',
private_library=private_library)
diff --git a/lib/torture/torture.pc.in b/lib/torture/torture.pc.in
deleted file mode 100644
index e0421b0..0000000
--- a/lib/torture/torture.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-modulesdir=${prefix}/modules/torture
-
-Name: torture
-Description: Samba torture (test) suite
-Requires: talloc
-Version: @PACKAGE_VERSION@
-Libs: @LIB_RPATH@ -L${libdir} -ltorture
-Cflags: -I${includedir} -DHAVE_IMMEDIATE_STRUCTURES=1
diff --git a/lib/torture/wscript_build b/lib/torture/wscript_build
index ad047e2..31c3862 100644
--- a/lib/torture/wscript_build
+++ b/lib/torture/wscript_build
@@ -1,9 +1,8 @@
#!/usr/bin/env python
bld.SAMBA_LIBRARY('torture',
- source='torture.c subunit.c simple.c',
- vnum='0.0.1',
- pc_files='torture.pc',
- public_deps='samba-hostconfig samba-util errors talloc tevent',
- public_headers='torture.h'
- )
+ private_library=True,
+ source='torture.c subunit.c simple.c',
+ public_deps='samba-hostconfig samba-util samba-errors talloc tevent',
+ private_headers='torture.h'
+ )
diff --git a/lib/util/samba_util.h b/lib/util/samba_util.h
index d2868d7..1f265e8 100644
--- a/lib/util/samba_util.h
+++ b/lib/util/samba_util.h
@@ -61,6 +61,8 @@ extern const char *panic_action;
#include "fault.h"
+#include "lib/util/util.h"
+
/**
* Write backtrace to debug log
*/
@@ -583,35 +585,6 @@ _PUBLIC_ bool process_exists_by_pid(pid_t pid);
_PUBLIC_ bool fcntl_lock(int fd, int op, off_t offset, off_t count, int type);
/**
- * Write dump of binary data to a callback
- */
-void dump_data_cb(const uint8_t *buf, int len,
- bool omit_zero_bytes,
- void (*cb)(const char *buf, void *private_data),
- void *private_data);
-
-/**
- * Write dump of binary data to a FILE
- */
-void dump_data_file(const uint8_t *buf, int len, bool omit_zero_bytes,
- FILE *f);
-
-/**
- * Write dump of binary data to the log file.
- *
- * The data is only written if the log level is at least level.
- */
-_PUBLIC_ void dump_data(int level, const uint8_t *buf,int len);
-
-/**
- * Write dump of binary data to the log file.
- *
- * The data is only written if the log level is at least level for
- * debug class dbgc_class.
- */
-_PUBLIC_ void dump_data_dbgc(int dbgc_class, int level, const uint8_t *buf, int len);
-
-/**
* Write dump of binary data to the log file.
*
* The data is only written if the log level is at least level.
diff --git a/lib/util/time_basic.c b/lib/util/time_basic.c
index 8113bb5..095236b 100644
--- a/lib/util/time_basic.c
+++ b/lib/util/time_basic.c
@@ -22,6 +22,7 @@
*/
#include "replace.h"
+#include "system/time.h"
#include "lib/util/time_basic.h"
/**
diff --git a/lib/util/time_basic.h b/lib/util/time_basic.h
index d485399..e04cf1c 100644
--- a/lib/util/time_basic.h
+++ b/lib/util/time_basic.h
@@ -24,8 +24,7 @@
#ifndef _SAMBA_TIME_BASIC_H_
#define _SAMBA_TIME_BASIC_H_
-#include "replace.h"
-#include "system/time.h"
+struct timeval;
/**
a gettimeofday wrapper
diff --git a/lib/util/util.h b/lib/util/util.h
new file mode 100644
index 0000000..5a0ce5c
--- /dev/null
+++ b/lib/util/util.h
@@ -0,0 +1,53 @@
+/*
+ Unix SMB/CIFS implementation.
+ Utility functions for Samba
+ Copyright (C) Andrew Tridgell 1992-1999
+ Copyright (C) Jelmer Vernooij 2005
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __UTIL_SAMBA_UTIL_H__
+#define __UTIL_SAMBA_UTIL_H__
+
+/**
+ * Write dump of binary data to a callback
+ */
+void dump_data_cb(const uint8_t *buf, int len,
+ bool omit_zero_bytes,
+ void (*cb)(const char *buf, void *private_data),
+ void *private_data);
+
+/**
+ * Write dump of binary data to a FILE
+ */
+void dump_data_file(const uint8_t *buf, int len, bool omit_zero_bytes,
+ FILE *f);
+
+/**
+ * Write dump of binary data to the log file.
+ *
+ * The data is only written if the log level is at least level.
+ */
+_PUBLIC_ void dump_data(int level, const uint8_t *buf,int len);
+
+/**
+ * Write dump of binary data to the log file.
+ *
+ * The data is only written if the log level is at least level for
+ * debug class dbgc_class.
+ */
+_PUBLIC_ void dump_data_dbgc(int dbgc_class, int level, const uint8_t *buf, int len);
+
+#endif
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 226b15e..31e2958 100755
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -104,9 +104,8 @@ if not bld.env.SAMBA_UTIL_CORE_ONLY:
server_id.c dprintf.c bitmap.c pidfile.c
tevent_debug.c memcache.c''',
deps='samba-util-core DYNCONFIG close-low-fd tini tiniparser genrand',
-
public_deps='talloc tevent execinfo pthread LIBCRYPTO charset util_setid systemd systemd-daemon',
- 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 idtree.h idtree_random.h blocking.h signal.h substitute.h fault.h genrand.h',
+ public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h string_wrappers.h idtree.h idtree_random.h blocking.h signal.h substitute.h fault.h genrand.h',
header_path= [ ('dlinklist.h samba_util.h', '.'), ('*', 'util') ],
local_include=False,
vnum='0.0.1',
@@ -115,7 +114,7 @@ if not bld.env.SAMBA_UTIL_CORE_ONLY:
bld.SAMBA_LIBRARY('samba-modules',
source='modules.c',
- deps='errors samba-util',
+ deps='samba-errors samba-util',
local_include=False,
private_library=True)
@@ -144,7 +143,7 @@ if not bld.env.SAMBA_UTIL_CORE_ONLY:
bld.SAMBA_LIBRARY('tevent-util',
source='tevent_ntstatus.c tevent_werror.c',
local_include=False,
- public_deps='tevent errors tevent-unix-util',
+ public_deps='tevent samba-errors tevent-unix-util',
public_headers='tevent_ntstatus.h tevent_werror.h',
header_path=[ ('*', 'util') ],
pc_files=[],
diff --git a/libcli/auth/netlogon_creds_cli.c b/libcli/auth/netlogon_creds_cli.c
index 1ea2f75..7c867cf 100644
--- a/libcli/auth/netlogon_creds_cli.c
+++ b/libcli/auth/netlogon_creds_cli.c
@@ -35,6 +35,7 @@
#include "netlogon_creds_cli.h"
#include "source3/include/messages.h"
#include "source3/include/g_lock.h"
+#include "libds/common/roles.h"
struct netlogon_creds_cli_locked_state;
--
Samba Shared Repository
More information about the samba-cvs
mailing list