From 0e61d825307c14c750898f212bb0ed65212ac84a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Thu, 14 Jan 2016 00:26:25 +0000 Subject: [PATCH 1/8] Make libpolicy private. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jelmer Vernooij --- source4/lib/policy/wscript_build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source4/lib/policy/wscript_build b/source4/lib/policy/wscript_build index b8ba638..69ba017 100644 --- a/source4/lib/policy/wscript_build +++ b/source4/lib/policy/wscript_build @@ -6,7 +6,8 @@ bld.SAMBA_LIBRARY('samba-policy', public_deps='ldb samba-net', vnum='0.0.1', pyembed=True, - public_headers='policy.h' + private_headers='policy.h', + private_library=True, ) bld.SAMBA_PYTHON('py_policy', From e3f94380c2b23761dcd957658e7214f95467a1c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Thu, 14 Jan 2016 00:26:44 +0000 Subject: [PATCH 2/8] Stop installing any libsamba-util headers not used (indirectly) by OpenChange. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jelmer Vernooij --- lib/util/wscript_build | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/util/wscript_build b/lib/util/wscript_build index 31e2958..0f434ee 100755 --- a/lib/util/wscript_build +++ b/lib/util/wscript_build @@ -105,8 +105,9 @@ if not bld.env.SAMBA_UTIL_CORE_ONLY: 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 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') ], + public_headers='debug.h byteorder.h data_blob.h memory.h time.h attr.h', + private_headers='samba_util.h signal.h idtree.h idtree_random.h talloc_stack.h xfile.h string_wrappers.h blocking.h fault.h genrand.h safe_string.h', + header_path= [ ('*', 'util') ], local_include=False, vnum='0.0.1', pc_files='samba-util.pc' From fd98f3110b1c694e1a830176fd5dd182e6cdb459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Thu, 14 Jan 2016 00:27:31 +0000 Subject: [PATCH 3/8] Stop installing tsocket_internal.h. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jelmer Vernooij --- lib/tsocket/wscript_build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/tsocket/wscript_build b/lib/tsocket/wscript_build index 420daff..7af6331 100644 --- a/lib/tsocket/wscript_build +++ b/lib/tsocket/wscript_build @@ -4,6 +4,7 @@ bld.SAMBA_SUBSYSTEM('LIBTSOCKET', source='tsocket.c tsocket_helpers.c tsocket_bsd.c', public_deps='talloc tevent iov_buf socket-blocking', - public_headers='tsocket.h tsocket_internal.h', + public_headers='tsocket.h', + private_headers='tsocket_internal.h', ) From f3ca698ca7b96ad68f257fd2514e5261f6c3b3cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Thu, 14 Jan 2016 00:49:48 +0000 Subject: [PATCH 4/8] Stop installing auth.h. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jelmer Vernooij --- libcli/auth/wscript_build | 2 +- librpc/wscript_build | 2 -- source4/auth/session.h | 9 +++++---- source4/rpc_server/backupkey/dcesrv_backupkey_heimdal.c | 1 + source4/rpc_server/drsuapi/drsutil.c | 1 + source4/rpc_server/drsuapi/getncchanges.c | 1 + source4/rpc_server/drsuapi/updaterefs.c | 1 + source4/rpc_server/drsuapi/writespn.c | 1 + source4/rpc_server/handles.c | 2 +- 9 files changed, 12 insertions(+), 8 deletions(-) diff --git a/libcli/auth/wscript_build b/libcli/auth/wscript_build index 475b7d6..9b6d22a 100755 --- a/libcli/auth/wscript_build +++ b/libcli/auth/wscript_build @@ -19,7 +19,7 @@ bld.SAMBA_SUBSYSTEM('NTLM_CHECK', bld.SAMBA_SUBSYSTEM('LIBCLI_AUTH', source='credentials.c session.c smbencrypt.c smbdes.c', public_deps='MSRPC_PARSE', - public_headers='credentials.h:domain_credentials.h' + private_headers='credentials.h:domain_credentials.h' ) diff --git a/librpc/wscript_build b/librpc/wscript_build index 135b307..c995bf8 100644 --- a/librpc/wscript_build +++ b/librpc/wscript_build @@ -10,8 +10,6 @@ bld.SAMBA_SUBSYSTEM('NDR_AUDIOSRV', bld.SAMBA_SUBSYSTEM('NDR_AUTH', source='gen_ndr/ndr_auth.c ndr/ndr_auth.c', - public_headers='gen_ndr/auth.h', - header_path='gen_ndr', public_deps='ndr NDR_SECURITY ndr-krb5pac' ) diff --git a/source4/auth/session.h b/source4/auth/session.h index 97a8aba..7155c73 100644 --- a/source4/auth/session.h +++ b/source4/auth/session.h @@ -21,13 +21,14 @@ #ifndef _SAMBA_AUTH_SESSION_H #define _SAMBA_AUTH_SESSION_H -#include "librpc/gen_ndr/security.h" -#include "librpc/gen_ndr/netlogon.h" -#include "librpc/gen_ndr/auth.h" - struct tevent_context; struct ldb_context; struct ldb_dn; +struct auth_user_info_dc; +struct auth_session_info; +struct auth_session_info_transport; +struct dom_sid; + /* Create a security token for a session SYSTEM (the most * trusted/prvilaged account), including the local machine account as * the off-host credentials */ diff --git a/source4/rpc_server/backupkey/dcesrv_backupkey_heimdal.c b/source4/rpc_server/backupkey/dcesrv_backupkey_heimdal.c index 90cc4fb..d505aca 100644 --- a/source4/rpc_server/backupkey/dcesrv_backupkey_heimdal.c +++ b/source4/rpc_server/backupkey/dcesrv_backupkey_heimdal.c @@ -39,6 +39,7 @@ #include #include "../lib/tsocket/tsocket.h" #include "../libcli/security/security.h" +#include "../librpc/gen_ndr/auth.h" #include "librpc/gen_ndr/ndr_security.h" #include "lib/crypto/arcfour.h" #include "libds/common/roles.h" diff --git a/source4/rpc_server/drsuapi/drsutil.c b/source4/rpc_server/drsuapi/drsutil.c index 2762a4e..ff5bd62 100644 --- a/source4/rpc_server/drsuapi/drsutil.c +++ b/source4/rpc_server/drsuapi/drsutil.c @@ -24,6 +24,7 @@ #include "dsdb/samdb/samdb.h" #include "libcli/security/security.h" #include "libcli/security/session.h" +#include "librpc/gen_ndr/auth.h" #include "param/param.h" #include "auth/session.h" #include "rpc_server/drsuapi/dcesrv_drsuapi.h" diff --git a/source4/rpc_server/drsuapi/getncchanges.c b/source4/rpc_server/drsuapi/getncchanges.c index d755306..c0fb4ca 100644 --- a/source4/rpc_server/drsuapi/getncchanges.c +++ b/source4/rpc_server/drsuapi/getncchanges.c @@ -24,6 +24,7 @@ #include "rpc_server/dcerpc_server.h" #include "dsdb/samdb/samdb.h" #include "param/param.h" +#include "librpc/gen_ndr/auth.h" #include "librpc/gen_ndr/ndr_drsblobs.h" #include "librpc/gen_ndr/ndr_drsuapi.h" #include "librpc/gen_ndr/ndr_security.h" diff --git a/source4/rpc_server/drsuapi/updaterefs.c b/source4/rpc_server/drsuapi/updaterefs.c index 6fdbf2e..9a2eb38 100644 --- a/source4/rpc_server/drsuapi/updaterefs.c +++ b/source4/rpc_server/drsuapi/updaterefs.c @@ -27,6 +27,7 @@ #include "rpc_server/drsuapi/dcesrv_drsuapi.h" #include "auth/session.h" #include "librpc/gen_ndr/ndr_drsuapi.h" +#include "librpc/gen_ndr/auth.h" struct repsTo { uint32_t count; diff --git a/source4/rpc_server/drsuapi/writespn.c b/source4/rpc_server/drsuapi/writespn.c index 04a4792..5f309cf 100644 --- a/source4/rpc_server/drsuapi/writespn.c +++ b/source4/rpc_server/drsuapi/writespn.c @@ -28,6 +28,7 @@ #include "auth/kerberos/kerberos.h" #include "libcli/security/security.h" #include "libcli/security/session.h" +#include "librpc/gen_ndr/auth.h" #include "rpc_server/drsuapi/dcesrv_drsuapi.h" #include "auth/session.h" diff --git a/source4/rpc_server/handles.c b/source4/rpc_server/handles.c index be9f16c..5c5ac72 100644 --- a/source4/rpc_server/handles.c +++ b/source4/rpc_server/handles.c @@ -23,7 +23,7 @@ #include "../lib/util/dlinklist.h" #include "rpc_server/dcerpc_server.h" #include "libcli/security/security.h" -#include "auth/session.h" +#include "librpc/gen_ndr/auth.h" /* destroy a rpc handle From 54f91b5d1c86994189461d9f73902b62a6f04f8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Thu, 14 Jan 2016 00:53:14 +0000 Subject: [PATCH 5/8] Stop installing ndr_nbt as library. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jelmer Vernooij --- librpc/ndr_nbt.pc.in | 11 ----------- librpc/wscript_build | 6 +----- 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 librpc/ndr_nbt.pc.in diff --git a/librpc/ndr_nbt.pc.in b/librpc/ndr_nbt.pc.in deleted file mode 100644 index 2083e2d..0000000 --- a/librpc/ndr_nbt.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: ndr-nbt -Description: NDR marshallers for nbt formats -Requires: ndr -Version: @PACKAGE_VERSION@ -Libs: @LIB_RPATH@ -L${libdir} -lndr-nbt -Cflags: -I${includedir} -DHAVE_IMMEDIATE_STRUCTURES=1 -D_GNU_SOURCE=1 diff --git a/librpc/wscript_build b/librpc/wscript_build index c995bf8..88af2e6 100644 --- a/librpc/wscript_build +++ b/librpc/wscript_build @@ -397,13 +397,9 @@ bld.SAMBA_SUBSYSTEM('NDR_SCHANNEL', public_deps='ndr ndr_nbt' ) -bld.SAMBA_LIBRARY('ndr_nbt', +bld.SAMBA_SUBSYSTEM('ndr_nbt', source='gen_ndr/ndr_nbt.c ndr/ndr_nbt.c', public_deps='ndr NDR_NBT_BUF NDR_SECURITY', - public_headers='gen_ndr/nbt.h gen_ndr/ndr_nbt.h ndr/ndr_nbt.h', - header_path=[ ('gen_ndr*', 'gen_ndr'), ('ndr*', 'ndr')], - pc_files='ndr_nbt.pc', - vnum='0.0.1' ) bld.SAMBA_SUBSYSTEM('NDR_BACKUPKEY', From 4b16ebfbb0fe8e1e3624ad92c57f147be64a0621 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Thu, 14 Jan 2016 00:55:29 +0000 Subject: [PATCH 6/8] Stop installing ndr_krb5pac. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jelmer Vernooij --- librpc/ndr_krb5pac.pc.in | 11 ----------- librpc/wscript_build | 6 +----- 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 librpc/ndr_krb5pac.pc.in diff --git a/librpc/ndr_krb5pac.pc.in b/librpc/ndr_krb5pac.pc.in deleted file mode 100644 index 597bbd1..0000000 --- a/librpc/ndr_krb5pac.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: ndr-krb5pac -Description: NDR marshallers for the KRB5 PAC formats -Requires: ndr -Version: @PACKAGE_VERSION@ -Libs: @LIB_RPATH@ -L${libdir} -lndr-krb5pac -Cflags: -I${includedir} -DHAVE_IMMEDIATE_STRUCTURES=1 -D_GNU_SOURCE=1 diff --git a/librpc/wscript_build b/librpc/wscript_build index 88af2e6..fba1f52 100644 --- a/librpc/wscript_build +++ b/librpc/wscript_build @@ -359,13 +359,9 @@ bld.SAMBA_SUBSYSTEM('NDR_DRSBLOBS', header_path=[ ('gen_ndr*', 'gen_ndr'), ('ndr*', 'ndr')] ) -bld.SAMBA_LIBRARY('ndr-krb5pac', +bld.SAMBA_SUBSYSTEM('ndr-krb5pac', source='ndr/ndr_krb5pac.c gen_ndr/ndr_krb5pac.c', public_deps='ndr ndr-standard NDR_SECURITY', - public_headers='gen_ndr/krb5pac.h gen_ndr/ndr_krb5pac.h', - header_path='gen_ndr', - pc_files='ndr_krb5pac.pc', - vnum='0.0.1' ) bld.SAMBA_LIBRARY('ndr-standard', From 9923eb734f6c3bc5749a9dd7ae198199431c9440 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Thu, 14 Jan 2016 01:04:02 +0000 Subject: [PATCH 7/8] Stop installing drsblobs headers. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jelmer Vernooij --- librpc/wscript_build | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/librpc/wscript_build b/librpc/wscript_build index fba1f52..01f0c6f 100644 --- a/librpc/wscript_build +++ b/librpc/wscript_build @@ -355,8 +355,7 @@ bld.SAMBA_SUBSYSTEM('NDR_DRSUAPI', bld.SAMBA_SUBSYSTEM('NDR_DRSBLOBS', source='ndr/ndr_drsblobs.c gen_ndr/ndr_drsblobs.c', public_deps='ndr NDR_DRSUAPI', - public_headers='gen_ndr/ndr_drsblobs.h gen_ndr/drsblobs.h ndr/ndr_drsblobs.h', - header_path=[ ('gen_ndr*', 'gen_ndr'), ('ndr*', 'ndr')] + private_headers='gen_ndr/ndr_drsblobs.h gen_ndr/drsblobs.h ndr/ndr_drsblobs.h', ) bld.SAMBA_SUBSYSTEM('ndr-krb5pac', From 7462d36a006c18b112954b04f98ee088243d58c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Thu, 14 Jan 2016 01:20:39 +0000 Subject: [PATCH 8/8] Stop installing drsuapi headers. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jelmer Vernooij --- librpc/wscript_build | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/librpc/wscript_build b/librpc/wscript_build index 01f0c6f..19e62ef 100644 --- a/librpc/wscript_build +++ b/librpc/wscript_build @@ -348,8 +348,7 @@ bld.SAMBA_SUBSYSTEM('NDR_DCERPC', bld.SAMBA_SUBSYSTEM('NDR_DRSUAPI', source='ndr/ndr_drsuapi.c gen_ndr/ndr_drsuapi.c', public_deps='ndr NDR_COMPRESSION NDR_SECURITY ndr-standard asn1util', - public_headers='gen_ndr/ndr_drsuapi.h gen_ndr/drsuapi.h ndr/ndr_drsuapi.h', - header_path=[ ('gen_ndr*', 'gen_ndr'), ('ndr*', 'ndr')] + private_headers='gen_ndr/ndr_drsuapi.h gen_ndr/drsuapi.h ndr/ndr_drsuapi.h', ) bld.SAMBA_SUBSYSTEM('NDR_DRSBLOBS',