summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--source4/build/smb_build/config_mk.pm3
-rw-r--r--source4/build/smb_build/input.pm17
-rw-r--r--source4/headermap.txt9
-rw-r--r--source4/lib/charset/charset.h2
-rw-r--r--source4/lib/cmdline/config.mk1
-rw-r--r--source4/lib/cmdline/popt_common.h2
-rw-r--r--source4/lib/util/util.h1
-rw-r--r--source4/libcli/config.mk3
-rw-r--r--source4/libcli/ldap/config.mk3
-rw-r--r--source4/libcli/libcli.h6
-rw-r--r--source4/libcli/raw/interfaces.h6
-rw-r--r--source4/libcli/raw/libcliraw.h7
-rw-r--r--source4/libcli/smb2/smb2.h2
-rw-r--r--source4/libcli/smb2/smb2_calls.h1
-rw-r--r--source4/librpc/config.mk2
-rw-r--r--source4/smb_server/smb_server.h2
-rw-r--r--source4/torture/config.mk3
17 files changed, 47 insertions, 23 deletions
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index 2bc29535674..6be817c58d5 100644
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -63,7 +63,8 @@ my $section_types = {
"MANPAGE" => "string",
"INSTALLDIR" => "string",
"PRIVATE_PROTO_HEADER" => "string",
- "PUBLIC_HEADERS" => "string",
+ "PUBLIC_PROTO_HEADER" => "string",
+ "PUBLIC_HEADERS" => "list",
"EXTRA_CFLAGS" => "string"
},
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index 369e4aa75b6..704dafa3714 100644
--- a/source4/build/smb_build/input.pm
+++ b/source4/build/smb_build/input.pm
@@ -147,18 +147,6 @@ sub check($$$$$)
my ($INPUT, $enabled, $subsys_ot, $lib_ot, $module_ot) = @_;
foreach my $part (values %$INPUT) {
- unless(defined($part->{NOPROTO})) {
- if ($part->{TYPE} eq "MODULE" or $part->{TYPE} eq "BINARY") {
- $part->{NOPROTO} = "YES";
- } else {
- $part->{NOPROTO} = "NO";
- }
- }
-
- if (defined($part->{PRIVATE_PROTO_HEADER})) {
- $part->{NOPROTO} = "YES";
- }
-
unless (defined($part->{STANDARD_VISIBILITY})) {
if ($part->{TYPE} eq "MODULE" or $part->{TYPE} eq "BINARY") {
$part->{STANDARD_VISIBILITY} = "hidden";
@@ -170,9 +158,12 @@ sub check($$$$$)
unless (defined($part->{EXTRA_CFLAGS})) {
$part->{EXTRA_CFLAGS} = "";
}
+
+ unless (defined($part->{PUBLIC_HEADERS})) {
+ $part->{PUBLIC_HEADERS} = [];
+ }
if (defined($part->{PUBLIC_PROTO_HEADER})) {
- $part->{NOPROTO} = "YES";
push (@{$part->{PUBLIC_HEADERS}}, $part->{PUBLIC_PROTO_HEADER});
}
diff --git a/source4/headermap.txt b/source4/headermap.txt
index c761272abe6..816c75da953 100644
--- a/source4/headermap.txt
+++ b/source4/headermap.txt
@@ -60,3 +60,12 @@ auth/gensec/gensec_proto.h: gensec/proto.h
libcli/auth/credentials.h: domain_credentials.h
lib/charset/charset.h: charset.h
lib/charset/charset_proto.h: charset/proto.h
+libcli/ldap/ldap.h: ldap.h
+libcli/ldap/ldap_proto.h: ldap_proto.h
+torture/torture.h: torture.h
+torture/proto.h: torture/proto.h
+libcli/libcli.h: client.h
+libcli/libcli_proto.h: client/proto.h
+librpc/gen_ndr/nbt.h: gen_ndr/nbt.h
+librpc/gen_ndr/svcctl.h: gen_ndr/nbt.h
+lib/cmdline/popt_common.h: samba/popt.h
diff --git a/source4/lib/charset/charset.h b/source4/lib/charset/charset.h
index df67aebb559..629786ee950 100644
--- a/source4/lib/charset/charset.h
+++ b/source4/lib/charset/charset.h
@@ -22,6 +22,8 @@
#ifndef __CHARSET_H__
#define __CHARSET_H__
+#include "lib/talloc/talloc.h"
+
/* this defines the charset types used in samba */
typedef enum {CH_UTF16=0, CH_UNIX=1, CH_DISPLAY=2, CH_DOS=3, CH_UTF8=4, CH_UTF16BE=5} charset_t;
diff --git a/source4/lib/cmdline/config.mk b/source4/lib/cmdline/config.mk
index 2dc957cc4d1..cc82ba443eb 100644
--- a/source4/lib/cmdline/config.mk
+++ b/source4/lib/cmdline/config.mk
@@ -4,6 +4,7 @@ OBJ_FILES = credentials.o
REQUIRED_SUBSYSTEMS = CREDENTIALS
[SUBSYSTEM::POPT_SAMBA]
+PUBLIC_HEADERS = popt_common.h
OBJ_FILES = popt_common.o
[SUBSYSTEM::POPT_CREDENTIALS]
diff --git a/source4/lib/cmdline/popt_common.h b/source4/lib/cmdline/popt_common.h
index 785a50ae70c..a2eaebbbeaa 100644
--- a/source4/lib/cmdline/popt_common.h
+++ b/source4/lib/cmdline/popt_common.h
@@ -21,7 +21,7 @@
#ifndef _POPT_COMMON_H
#define _POPT_COMMON_H
-#include "popt.h"
+#include <popt.h>
/* Common popt structures */
extern struct poptOption popt_common_samba[];
diff --git a/source4/lib/util/util.h b/source4/lib/util/util.h
index 60cba737a97..d6b412ee719 100644
--- a/source4/lib/util/util.h
+++ b/source4/lib/util/util.h
@@ -24,6 +24,7 @@
#ifndef _SAMBA_UTIL_H_
#define _SAMBA_UTIL_H_
+#include "core.h"
#include "charset/charset.h"
/**
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index b2148032152..465146ec17f 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -96,6 +96,7 @@ OBJ_FILES = \
REQUIRED_SUBSYSTEMS = LIBCLI_NBT MESSAGING
[LIBRARY::LIBCLI]
+PUBLIC_HEADERS = libcli.h
VERSION = 0.0.1
SO_VERSION = 0
DESCRIPTION = SMB/CIFS client library
@@ -105,7 +106,7 @@ REQUIRED_SUBSYSTEMS = LIBCLI_RAW LIBCLI_UTILS LIBCLI_AUTH \
[SUBSYSTEM::LIBSMB]
REQUIRED_SUBSYSTEMS = LIBCLI SOCKET
-PRIVATE_PROTO_HEADER = libcli_proto.h
+PUBLIC_PROTO_HEADER = libcli_proto.h
OBJ_FILES = clireadwrite.o \
cliconnect.o \
clifile.o \
diff --git a/source4/libcli/ldap/config.mk b/source4/libcli/ldap/config.mk
index c0ad8d157f2..624b2603ecc 100644
--- a/source4/libcli/ldap/config.mk
+++ b/source4/libcli/ldap/config.mk
@@ -1,7 +1,8 @@
#################################
# Start SUBSYSTEM LIBCLI_LDAP
[SUBSYSTEM::LIBCLI_LDAP]
-PRIVATE_PROTO_HEADER = ldap_proto.h
+PUBLIC_PROTO_HEADER = ldap_proto.h
+PUBLIC_HEADERS = ldap.h
OBJ_FILES = ldap.o \
ldap_client.o \
ldap_bind.o \
diff --git a/source4/libcli/libcli.h b/source4/libcli/libcli.h
index c358ac57524..c104fcf80eb 100644
--- a/source4/libcli/libcli.h
+++ b/source4/libcli/libcli.h
@@ -22,7 +22,8 @@
#ifndef __LIBCLI_H__
#define __LIBCLI_H__
-#include "smb.h"
+#include <core.h>
+#include "librpc/gen_ndr/nbt.h"
/*
smbcli_state: internal state used in libcli library for single-threaded callers,
@@ -49,6 +50,9 @@ struct nbt_dc_name {
const char *name;
};
+struct cli_credentials;
+struct event_context;
+#include "libcli/raw/libcliraw.h"
#include "libcli/libcli_proto.h"
#endif /* __LIBCLI_H__ */
diff --git a/source4/libcli/raw/interfaces.h b/source4/libcli/raw/interfaces.h
index 20b729caba3..d662b9f5ae5 100644
--- a/source4/libcli/raw/interfaces.h
+++ b/source4/libcli/raw/interfaces.h
@@ -19,6 +19,11 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#ifndef __LIBCLI_RAW_INTERFACES_H__
+#define __LIBCLI_RAW_INTERFACES_H__
+
+#include "smb.h"
+
/* this structure is just a wrapper for a string, the only reason we
bother with this is that it allows us to check the length provided
on the wire in testsuite test code to ensure that we are
@@ -2048,3 +2053,4 @@ union smb_search_close {
} findclose;
};
+#endif /* __LIBCLI_RAW_INTERFACES_H__ */
diff --git a/source4/libcli/raw/libcliraw.h b/source4/libcli/raw/libcliraw.h
index f115a18d231..21d0b0dcdb4 100644
--- a/source4/libcli/raw/libcliraw.h
+++ b/source4/libcli/raw/libcliraw.h
@@ -20,8 +20,10 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#ifndef __LIBCLI_RAW_H__
+#define __LIBCLI_RAW_H__
+
#include "libcli/raw/request.h"
-#include "smb.h"
#include "librpc/gen_ndr/nbt.h"
struct smbcli_tree; /* forward declare */
@@ -271,4 +273,7 @@ struct smbcli_request {
goto failed; \
}
+#include "libcli/raw/interfaces.h"
#include "libcli/raw/raw_proto.h"
+
+#endif /* __LIBCLI_RAW__H__ */
diff --git a/source4/libcli/smb2/smb2.h b/source4/libcli/smb2/smb2.h
index 913d58409b0..ceafacf9d40 100644
--- a/source4/libcli/smb2/smb2.h
+++ b/source4/libcli/smb2/smb2.h
@@ -20,8 +20,6 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include "smb.h"
-
struct smb2_options {
uint32_t timeout;
};
diff --git a/source4/libcli/smb2/smb2_calls.h b/source4/libcli/smb2/smb2_calls.h
index 7349b609cb7..af1730aeeeb 100644
--- a/source4/libcli/smb2/smb2_calls.h
+++ b/source4/libcli/smb2/smb2_calls.h
@@ -20,6 +20,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include "libcli/raw/interfaces.h"
struct smb2_negprot {
struct {
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index c886c814863..f9286736eff 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -201,6 +201,7 @@ REQUIRED_SUBSYSTEMS = LIBNDR NDR_SVCCTL
[LIBRARY::NDR_SVCCTL]
VERSION = 0.0.1
+PUBLIC_HEADERS = gen_ndr/svcctl.h
SO_VERSION = 0
DESCRIPTION =
OBJ_FILES = gen_ndr/ndr_svcctl.o
@@ -409,6 +410,7 @@ VERSION = 0.0.1
SO_VERSION = 0
DESCRIPTION =
OBJ_FILES = gen_ndr/ndr_nbt.o
+PUBLIC_HEADERS = gen_ndr/nbt.h
REQUIRED_SUBSYSTEMS = LIBNDR NDR_MISC NDR_NBT_BUF NDR_SVCCTL
[LIBRARY::NDR_WINSREPL]
diff --git a/source4/smb_server/smb_server.h b/source4/smb_server/smb_server.h
index ab110890d0b..c266d1b9947 100644
--- a/source4/smb_server/smb_server.h
+++ b/source4/smb_server/smb_server.h
@@ -20,9 +20,9 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include "smb.h"
#include "libcli/raw/request.h"
#include "smbd/process_model.h"
+#include "libcli/raw/interfaces.h"
/*
this header declares the core context structures associated with smb
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index 3b75135e6f5..be165fb3709 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -220,7 +220,8 @@ REQUIRED_SUBSYSTEMS = \
# Start BINARY smbtorture
[BINARY::smbtorture]
INSTALLDIR = BINDIR
-PRIVATE_PROTO_HEADER = proto.h
+PUBLIC_HEADERS = torture.h
+PUBLIC_PROTO_HEADER = proto.h
OBJ_FILES = \
torture.o \
torture_util.o
generated by cgit (git 2.34.1) at 2024-11-06 05:27:49 +0000