sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

r14511: Install more headers

Browse Source 
(This used to be commit e1f896948f)
This commit is contained in:
Jelmer Vernooij 2006-03-17 13:55:10 +00:00 committed by Gerald (Jerry) Carter
parent 66b2ed2866
commit 5b0051e032
17 changed files with 47 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source4/build/smb_build/config_mk.pm
View File

@ -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"
},

17
source4/build/smb_build/input.pm
View File

@ -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});
}

9
source4/headermap.txt
View File

@ -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

2
source4/lib/charset/charset.h
View File

@ -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;

1
source4/lib/cmdline/config.mk
View File

@ -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]

2
source4/lib/cmdline/popt_common.h
View File

@ -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[];

1
source4/lib/util/util.h
View File

@ -24,6 +24,7 @@
#ifndef _SAMBA_UTIL_H_
#define _SAMBA_UTIL_H_
#include "core.h"
#include "charset/charset.h"
/**

3
source4/libcli/config.mk
View File

@ -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 \

3
source4/libcli/ldap/config.mk
View File

@ -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 \

6
source4/libcli/libcli.h
View File

@ -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__ */

6
source4/libcli/raw/interfaces.h
View File

@ -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__ */

7
source4/libcli/raw/libcliraw.h
View File

@ -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__ */

2
source4/libcli/smb2/smb2.h
View File

@ -20,8 +20,6 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "smb.h"
struct smb2_options {
uint32_t timeout;
};

1
source4/libcli/smb2/smb2_calls.h
View File

@ -20,6 +20,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "libcli/raw/interfaces.h"
struct smb2_negprot {
struct {

2
source4/librpc/config.mk
View File

@ -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]

2
source4/smb_server/smb_server.h
View File

@ -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

3
source4/torture/config.mk
View File

@ -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