svn commit: samba r13938 - in branches/SAMBA_4_0/source: . auth
auth/gensec include lib/cmdline lib/ldb libcli libnet passdb
rpc_server/lsa rpc_server/netlogon smbd winbind
jelmer at samba.org
jelmer at samba.org
Tue Mar 7 13:36:27 GMT 2006
Author: jelmer
Date: 2006-03-07 13:36:26 +0000 (Tue, 07 Mar 2006)
New Revision: 13938
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13938
Log:
Around round of splitups
Modified:
branches/SAMBA_4_0/source/auth/auth_unix.c
branches/SAMBA_4_0/source/auth/config.mk
branches/SAMBA_4_0/source/auth/gensec/config.mk
branches/SAMBA_4_0/source/auth/gensec/schannel.c
branches/SAMBA_4_0/source/include/includes.h
branches/SAMBA_4_0/source/lib/cmdline/config.mk
branches/SAMBA_4_0/source/lib/cmdline/popt_credentials.c
branches/SAMBA_4_0/source/lib/ldb/config.mk
branches/SAMBA_4_0/source/libcli/config.mk
branches/SAMBA_4_0/source/libnet/libnet_lookup.c
branches/SAMBA_4_0/source/main.mk
branches/SAMBA_4_0/source/passdb/config.mk
branches/SAMBA_4_0/source/passdb/secrets.h
branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c
branches/SAMBA_4_0/source/rpc_server/netlogon/dcerpc_netlogon.c
branches/SAMBA_4_0/source/smbd/process_standard.c
branches/SAMBA_4_0/source/smbd/server.c
branches/SAMBA_4_0/source/winbind/wb_samba3_cmd.c
branches/SAMBA_4_0/source/winbind/wb_server.c
Changeset:
Modified: branches/SAMBA_4_0/source/auth/auth_unix.c
===================================================================
--- branches/SAMBA_4_0/source/auth/auth_unix.c 2006-03-07 13:22:00 UTC (rev 13937)
+++ branches/SAMBA_4_0/source/auth/auth_unix.c 2006-03-07 13:36:26 UTC (rev 13938)
@@ -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
Modified: branches/SAMBA_4_0/source/auth/config.mk
===================================================================
--- branches/SAMBA_4_0/source/auth/config.mk 2006-03-07 13:22:00 UTC (rev 13937)
+++ branches/SAMBA_4_0/source/auth/config.mk 2006-03-07 13:36:26 UTC (rev 13938)
@@ -63,6 +63,7 @@
#######################
[SUBSYSTEM::PAM_ERRORS]
+PRIVATE_PROTO_HEADER = pam_errors.h
OBJ_FILES = pam_errors.o
#######################
Modified: branches/SAMBA_4_0/source/auth/gensec/config.mk
===================================================================
--- branches/SAMBA_4_0/source/auth/gensec/config.mk 2006-03-07 13:22:00 UTC (rev 13937)
+++ branches/SAMBA_4_0/source/auth/gensec/config.mk 2006-03-07 13:36:26 UTC (rev 13938)
@@ -59,6 +59,7 @@
################################################
# Start SUBSYSTEM SCHANNELDB
[SUBSYSTEM::SCHANNELDB]
+PRIVATE_PROTO_HEADER = schannel_state.h
OBJ_FILES = \
schannel_state.o
#
Modified: branches/SAMBA_4_0/source/auth/gensec/schannel.c
===================================================================
--- branches/SAMBA_4_0/source/auth/gensec/schannel.c 2006-03-07 13:22:00 UTC (rev 13937)
+++ branches/SAMBA_4_0/source/auth/gensec/schannel.c 2006-03-07 13:36:26 UTC (rev 13938)
@@ -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)
Modified: branches/SAMBA_4_0/source/include/includes.h
===================================================================
--- branches/SAMBA_4_0/source/include/includes.h 2006-03-07 13:22:00 UTC (rev 13937)
+++ branches/SAMBA_4_0/source/include/includes.h 2006-03-07 13:36:26 UTC (rev 13938)
@@ -123,6 +123,7 @@
#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)
Modified: branches/SAMBA_4_0/source/lib/cmdline/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/cmdline/config.mk 2006-03-07 13:22:00 UTC (rev 13937)
+++ branches/SAMBA_4_0/source/lib/cmdline/config.mk 2006-03-07 13:36:26 UTC (rev 13938)
@@ -1,4 +1,5 @@
[SUBSYSTEM::LIBCMDLINE_CREDENTIALS]
+PRIVATE_PROTO_HEADER = credentials.h
OBJ_FILES = credentials.o
REQUIRED_SUBSYSTEMS = CREDENTIALS
Modified: branches/SAMBA_4_0/source/lib/cmdline/popt_credentials.c
===================================================================
--- branches/SAMBA_4_0/source/lib/cmdline/popt_credentials.c 2006-03-07 13:22:00 UTC (rev 13937)
+++ branches/SAMBA_4_0/source/lib/cmdline/popt_credentials.c 2006-03-07 13:36:26 UTC (rev 13938)
@@ -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:
Modified: branches/SAMBA_4_0/source/lib/ldb/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/config.mk 2006-03-07 13:22:00 UTC (rev 13937)
+++ branches/SAMBA_4_0/source/lib/ldb/config.mk 2006-03-07 13:36:26 UTC (rev 13938)
@@ -172,7 +172,7 @@
################################################
# 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
Modified: branches/SAMBA_4_0/source/libcli/config.mk
===================================================================
--- branches/SAMBA_4_0/source/libcli/config.mk 2006-03-07 13:22:00 UTC (rev 13937)
+++ branches/SAMBA_4_0/source/libcli/config.mk 2006-03-07 13:36:26 UTC (rev 13938)
@@ -3,6 +3,7 @@
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 @@
REQUIRED_SUBSYSTEMS = LIBCLI_NBT LIBNETIF
[SUBSYSTEM::LIBCLI_FINDDCS]
+PRIVATE_PROTO_HEADER = finddcs.h
OBJ_FILES = \
finddcs.o
REQUIRED_SUBSYSTEMS = LIBCLI_NBT MESSAGING
Modified: branches/SAMBA_4_0/source/libnet/libnet_lookup.c
===================================================================
--- branches/SAMBA_4_0/source/libnet/libnet_lookup.c 2006-03-07 13:22:00 UTC (rev 13937)
+++ branches/SAMBA_4_0/source/libnet/libnet_lookup.c 2006-03-07 13:36:26 UTC (rev 13938)
@@ -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;
Modified: branches/SAMBA_4_0/source/main.mk
===================================================================
--- branches/SAMBA_4_0/source/main.mk 2006-03-07 13:22:00 UTC (rev 13937)
+++ branches/SAMBA_4_0/source/main.mk 2006-03-07 13:36:26 UTC (rev 13938)
@@ -248,6 +248,7 @@
lib/util/util_proto.h \
lib/charset/charset.h \
param/param.h \
+ libcli/util/proto.h
clean_pch:
-rm -f include/includes.h.gch
Modified: branches/SAMBA_4_0/source/passdb/config.mk
===================================================================
--- branches/SAMBA_4_0/source/passdb/config.mk 2006-03-07 13:22:00 UTC (rev 13937)
+++ branches/SAMBA_4_0/source/passdb/config.mk 2006-03-07 13:36:26 UTC (rev 13938)
@@ -1,3 +1,4 @@
[SUBSYSTEM::SECRETS]
+PRIVATE_PROTO_HEADER = proto.h
OBJ_FILES = secrets.o
REQUIRED_SUBSYSTEMS = SAMDB
Modified: branches/SAMBA_4_0/source/passdb/secrets.h
===================================================================
--- branches/SAMBA_4_0/source/passdb/secrets.h 2006-03-07 13:22:00 UTC (rev 13937)
+++ branches/SAMBA_4_0/source/passdb/secrets.h 2006-03-07 13:36:26 UTC (rev 13938)
@@ -35,4 +35,6 @@
#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 */
Modified: branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c 2006-03-07 13:22:00 UTC (rev 13937)
+++ branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c 2006-03-07 13:36:26 UTC (rev 13938)
@@ -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"
/*
Modified: branches/SAMBA_4_0/source/rpc_server/netlogon/dcerpc_netlogon.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/netlogon/dcerpc_netlogon.c 2006-03-07 13:22:00 UTC (rev 13937)
+++ branches/SAMBA_4_0/source/rpc_server/netlogon/dcerpc_netlogon.c 2006-03-07 13:36:26 UTC (rev 13938)
@@ -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;
Modified: branches/SAMBA_4_0/source/smbd/process_standard.c
===================================================================
--- branches/SAMBA_4_0/source/smbd/process_standard.c 2006-03-07 13:22:00 UTC (rev 13937)
+++ branches/SAMBA_4_0/source/smbd/process_standard.c 2006-03-07 13:36:26 UTC (rev 13938)
@@ -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
*/
Modified: branches/SAMBA_4_0/source/smbd/server.c
===================================================================
--- branches/SAMBA_4_0/source/smbd/server.c 2006-03-07 13:22:00 UTC (rev 13937)
+++ branches/SAMBA_4_0/source/smbd/server.c 2006-03-07 13:36:26 UTC (rev 13938)
@@ -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
Modified: branches/SAMBA_4_0/source/winbind/wb_samba3_cmd.c
===================================================================
--- branches/SAMBA_4_0/source/winbind/wb_samba3_cmd.c 2006-03-07 13:22:00 UTC (rev 13937)
+++ branches/SAMBA_4_0/source/winbind/wb_samba3_cmd.c 2006-03-07 13:36:26 UTC (rev 13938)
@@ -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.
Modified: branches/SAMBA_4_0/source/winbind/wb_server.c
===================================================================
--- branches/SAMBA_4_0/source/winbind/wb_server.c 2006-03-07 13:22:00 UTC (rev 13937)
+++ branches/SAMBA_4_0/source/winbind/wb_server.c 2006-03-07 13:36:26 UTC (rev 13938)
@@ -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)
{
More information about the samba-cvs
mailing list