summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-03-07 13:36:26 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:52:29 -0500
commit17ae598141b44142ad52a66cc4767029e3a73d6c (patch)
treef2bc452432344bea214be864501af3b333c0fde6
parent0de1ad5ae621ad99d507b38d3eb2e2015b2fbd71 (diff)
downloadsamba-17ae598141b44142ad52a66cc4767029e3a73d6c.tar.gz
samba-17ae598141b44142ad52a66cc4767029e3a73d6c.tar.bz2
samba-17ae598141b44142ad52a66cc4767029e3a73d6c.zip
r13938: Around round of splitups
(This used to be commit 2d655f05285a86bb1bbb882e4dd843def15c9dfa)
-rw-r--r--source4/auth/auth_unix.c1
-rw-r--r--source4/auth/config.mk1
-rw-r--r--source4/auth/gensec/config.mk1
-rw-r--r--source4/auth/gensec/schannel.c1
-rw-r--r--source4/include/includes.h1
-rw-r--r--source4/lib/cmdline/config.mk1
-rw-r--r--source4/lib/cmdline/popt_credentials.c1
-rw-r--r--source4/lib/ldb/config.mk2
-rw-r--r--source4/libcli/config.mk2
-rw-r--r--source4/libnet/libnet_lookup.c1
-rw-r--r--source4/main.mk1
-rw-r--r--source4/passdb/config.mk1
-rw-r--r--source4/passdb/secrets.h2
-rw-r--r--source4/rpc_server/lsa/dcesrv_lsa.c1
-rw-r--r--source4/rpc_server/netlogon/dcerpc_netlogon.c1
-rw-r--r--source4/smbd/process_standard.c4
-rw-r--r--source4/smbd/server.c1
-rw-r--r--source4/winbind/wb_samba3_cmd.c1
-rw-r--r--source4/winbind/wb_server.c1
19 files changed, 23 insertions, 2 deletions
diff --git a/source4/auth/auth_unix.c b/source4/auth/auth_unix.c
index eab86aecf8..417025dfdf 100644
--- a/source4/auth/auth_unix.c
+++ b/source4/auth/auth_unix.c
@@ -24,6 +24,7 @@
#include "auth/auth.h"
#include "system/passwd.h" /* needed by some systems for struct passwd */
#include "lib/socket/socket.h"
+#include "auth/pam_errors.h"
/* TODO: look at how to best fill in parms retrieveing a struct passwd info
* except in case USER_INFO_DONT_CHECK_UNIX_ACCOUNT is set
diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index 56bc28c840..7372f563de 100644
--- a/source4/auth/config.mk
+++ b/source4/auth/config.mk
@@ -63,6 +63,7 @@ REQUIRED_SUBSYSTEMS = \
#######################
[SUBSYSTEM::PAM_ERRORS]
+PRIVATE_PROTO_HEADER = pam_errors.h
OBJ_FILES = pam_errors.o
#######################
diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk
index 17e22123ab..79b6cdda09 100644
--- a/source4/auth/gensec/config.mk
+++ b/source4/auth/gensec/config.mk
@@ -59,6 +59,7 @@ REQUIRED_SUBSYSTEMS = AUTH SCHANNELDB NDR_SCHANNEL
################################################
# Start SUBSYSTEM SCHANNELDB
[SUBSYSTEM::SCHANNELDB]
+PRIVATE_PROTO_HEADER = schannel_state.h
OBJ_FILES = \
schannel_state.o
#
diff --git a/source4/auth/gensec/schannel.c b/source4/auth/gensec/schannel.c
index 0409b17c4d..2b3c330a2d 100644
--- a/source4/auth/gensec/schannel.c
+++ b/source4/auth/gensec/schannel.c
@@ -25,6 +25,7 @@
#include "librpc/gen_ndr/ndr_schannel.h"
#include "auth/auth.h"
#include "auth/gensec/schannel.h"
+#include "auth/gensec/schannel_state.h"
#include "auth/gensec/schannel_proto.h"
static size_t schannel_sig_size(struct gensec_security *gensec_security, size_t data_size)
diff --git a/source4/include/includes.h b/source4/include/includes.h
index adf4d37016..89d586b75c 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -123,6 +123,7 @@ enum brl_type {
#include "libcli/raw/interfaces.h"
#include "auth/credentials/credentials.h"
#include "libcli/nbt/libnbt.h"
+#include "libcli/util/proto.h"
#undef _PRINTF_ATTRIBUTE
#define _PRINTF_ATTRIBUTE(a1, a2)
diff --git a/source4/lib/cmdline/config.mk b/source4/lib/cmdline/config.mk
index 28e482d9b2..9380de53be 100644
--- a/source4/lib/cmdline/config.mk
+++ b/source4/lib/cmdline/config.mk
@@ -1,4 +1,5 @@
[SUBSYSTEM::LIBCMDLINE_CREDENTIALS]
+PRIVATE_PROTO_HEADER = credentials.h
OBJ_FILES = credentials.o
REQUIRED_SUBSYSTEMS = CREDENTIALS
diff --git a/source4/lib/cmdline/popt_credentials.c b/source4/lib/cmdline/popt_credentials.c
index 4a85fc5407..072ac418ae 100644
--- a/source4/lib/cmdline/popt_credentials.c
+++ b/source4/lib/cmdline/popt_credentials.c
@@ -21,6 +21,7 @@
#include "includes.h"
#include "lib/cmdline/popt_common.h"
+#include "lib/cmdline/credentials.h"
#include "auth/gensec/gensec.h"
/* Handle command line options:
diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index 423fef567f..3834ac0213 100644
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -172,7 +172,7 @@ OBJ_FILES = \
################################################
# Start SUBSYSTEM LIBLDB_CMDLINE
[SUBSYSTEM::LIBLDB_CMDLINE]
-NOPROTO = NO
+NOPROTO = YES
OBJ_FILES= \
tools/cmdline.o
REQUIRED_SUBSYSTEMS = LIBLDB LIBBASIC LIBPOPT POPT_SAMBA POPT_CREDENTIALS
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index abe4c76731..7dfa4717d8 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -3,6 +3,7 @@ include ldap/config.mk
include security/config.mk
[SUBSYSTEM::LIBCLI_UTILS]
+PRIVATE_PROTO_HEADER = util/proto.h
PUBLIC_HEADERS = util/nterr.h util/doserr.h util/nt_status.h
OBJ_FILES = util/asn1.o \
util/doserr.o \
@@ -92,6 +93,7 @@ OBJ_FILES = \
REQUIRED_SUBSYSTEMS = LIBCLI_NBT LIBNETIF
[SUBSYSTEM::LIBCLI_FINDDCS]
+PRIVATE_PROTO_HEADER = finddcs.h
OBJ_FILES = \
finddcs.o
REQUIRED_SUBSYSTEMS = LIBCLI_NBT MESSAGING
diff --git a/source4/libnet/libnet_lookup.c b/source4/libnet/libnet_lookup.c
index 968b76763a..2ef62901da 100644
--- a/source4/libnet/libnet_lookup.c
+++ b/source4/libnet/libnet_lookup.c
@@ -29,6 +29,7 @@
#include "lib/messaging/messaging.h"
#include "lib/messaging/irpc.h"
#include "libcli/resolve/resolve.h"
+#include "libcli/finddcs.h"
struct lookup_state {
struct composite_context *resolve_ctx;
diff --git a/source4/main.mk b/source4/main.mk
index ecc614ca7b..df0951d2a9 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -248,6 +248,7 @@ include/includes.h: \
lib/util/util_proto.h \
lib/charset/charset.h \
param/param.h \
+ libcli/util/proto.h
clean_pch:
-rm -f include/includes.h.gch
diff --git a/source4/passdb/config.mk b/source4/passdb/config.mk
index c57f79a577..09affdf589 100644
--- a/source4/passdb/config.mk
+++ b/source4/passdb/config.mk
@@ -1,3 +1,4 @@
[SUBSYSTEM::SECRETS]
+PRIVATE_PROTO_HEADER = proto.h
OBJ_FILES = secrets.o
REQUIRED_SUBSYSTEMS = SAMDB
diff --git a/source4/passdb/secrets.h b/source4/passdb/secrets.h
index 944a1a3e68..adbc9e1586 100644
--- a/source4/passdb/secrets.h
+++ b/source4/passdb/secrets.h
@@ -35,4 +35,6 @@ struct machine_acct_pass {
#define SECRETS_KRBTGT_SEARCH "(&((|(realm=%s)(flatname=%s))(samAccountName=krbtgt)))"
#define SECRETS_PRINCIPAL_SEARCH "(&(|(realm=%s)(flatname=%s))(servicePrincipalName=%s))"
+#include "passdb/proto.h"
+
#endif /* _SECRETS_H */
diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index 5af1dc3f40..e307305961 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -30,6 +30,7 @@
#include "libcli/security/proto.h"
#include "libcli/auth/proto.h"
#include "ntvfs/ntvfs.h"
+#include "passdb/secrets.h"
#include "db_wrap.h"
/*
diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index 7696888249..f434086425 100644
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -30,6 +30,7 @@
#include "rpc_server/samr/proto.h"
#include "db_wrap.h"
#include "libcli/auth/proto.h"
+#include "auth/gensec/schannel_state.h"
struct server_pipe_state {
struct netr_Credential client_challenge;
diff --git a/source4/smbd/process_standard.c b/source4/smbd/process_standard.c
index 8b319db1c2..dadbe5bf80 100644
--- a/source4/smbd/process_standard.c
+++ b/source4/smbd/process_standard.c
@@ -27,10 +27,12 @@
#include "lib/tdb/include/tdb.h"
#include "smb_server/smb_server.h"
-/* For sepecifiying event context to GSSAPI below */
+/* For specifiying event context to GSSAPI below */
#include "system/kerberos.h"
#include "heimdal/lib/gssapi/gssapi_locl.h"
+#include "passdb/secrets.h"
+
/*
called when the process model is selected
*/
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 93a4f1fb39..8488a37f5a 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -36,6 +36,7 @@
#include "auth/gensec/gensec.h"
#include "smbd/process_model.h"
#include "smbd/service.h"
+#include "passdb/secrets.h"
/*
recursively delete a directory tree
diff --git a/source4/winbind/wb_samba3_cmd.c b/source4/winbind/wb_samba3_cmd.c
index 39cee9baba..31365aa9eb 100644
--- a/source4/winbind/wb_samba3_cmd.c
+++ b/source4/winbind/wb_samba3_cmd.c
@@ -29,6 +29,7 @@
#include "version.h"
#include "librpc/gen_ndr/ndr_netlogon.h"
#include "libcli/security/proto.h"
+#include "auth/pam_errors.h"
/*
Send off the reply to an async Samba3 query, handling filling in the PAM, NTSTATUS and string errors.
diff --git a/source4/winbind/wb_server.c b/source4/winbind/wb_server.c
index f6083a6fc8..8cd5782168 100644
--- a/source4/winbind/wb_server.c
+++ b/source4/winbind/wb_server.c
@@ -31,6 +31,7 @@
#include "winbind/wb_server.h"
#include "lib/stream/packet.h"
#include "smbd/service.h"
+#include "passdb/secrets.h"
void wbsrv_terminate_connection(struct wbsrv_connection *wbconn, const char *reason)
{