r13903: Don't generate prototypes for modules and binaries in include/proto.h by

default.
(This used to be commit c80a8f1102caf744b66c13bebde38fba74983dc4)

31 files changed, 42 insertions, 11 deletions

diff --git a/TODO b/TODO
index 954cc5f806..36c05d5a28 100644
--- a/TODO
+++ b/TODO
@@ -13,6 +13,8 @@ upgrade process (from Samba3):
   Perhaps similar to eventlog so we can also use eventlog to retrieve the data?
 - improve handling of test results in testsuite
 
+- testsuite for the 'net' tool
+
 Configuration options
 =====================
 
diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index d8fc9a8ddf..9c14528572 100644
--- a/source4/auth/config.mk
+++ b/source4/auth/config.mk
@@ -9,6 +9,7 @@ include credentials/config.mk
 [MODULE::auth_sam]
 INIT_FUNCTION = auth_sam_init
 SUBSYSTEM = AUTH
+NOPROTO = NO
 OBJ_FILES = \
 		auth_sam.o
 REQUIRED_SUBSYSTEMS = \
diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk
index 0ba5a5e282..17e22123ab 100644
--- a/source4/auth/gensec/config.mk
+++ b/source4/auth/gensec/config.mk
@@ -38,6 +38,7 @@ REQUIRED_SUBSYSTEMS = KERBEROS AUTH
 [MODULE::gensec_spnego]
 SUBSYSTEM = GENSEC
 INIT_FUNCTION = gensec_spnego_init
+PRIVATE_PROTO_HEADER = spnego_proto.h
 OBJ_FILES = spnego.o \
 			spnego_parse.o
 # End MODULE gensec_spnego
@@ -47,6 +48,7 @@ OBJ_FILES = spnego.o \
 # Start MODULE gensec_schannel
 [MODULE::gensec_schannel]
 SUBSYSTEM = GENSEC
+PRIVATE_PROTO_HEADER = schannel_proto.h
 INIT_FUNCTION = gensec_schannel_init
 OBJ_FILES = schannel.o \
 			schannel_sign.o
diff --git a/source4/auth/gensec/schannel.c b/source4/auth/gensec/schannel.c
index 10c8f9853a..0409b17c4d 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_proto.h"
 
 static size_t schannel_sig_size(struct gensec_security *gensec_security, size_t data_size)
 {
diff --git a/source4/auth/gensec/spnego.c b/source4/auth/gensec/spnego.c
index 32b4ff96be..9d97e3d709 100644
--- a/source4/auth/gensec/spnego.c
+++ b/source4/auth/gensec/spnego.c
@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "auth/auth.h"
+#include "auth/gensec/spnego_proto.h"
 
 enum spnego_state_position {
 	SPNEGO_SERVER_START,
diff --git a/source4/auth/ntlmssp/config.mk b/source4/auth/ntlmssp/config.mk
index d10c98c838..32b917e4ce 100644
--- a/source4/auth/ntlmssp/config.mk
+++ b/source4/auth/ntlmssp/config.mk
@@ -2,11 +2,12 @@
 # Start MODULE gensec_ntlmssp
 [MODULE::gensec_ntlmssp]
 SUBSYSTEM = GENSEC
+NOPROTO = NO
 INIT_FUNCTION = gensec_ntlmssp_init
 OBJ_FILES = ntlmssp.o \
-		ntlmssp_parse.o \
 		ntlmssp_sign.o \
 		ntlmssp_client.o \
+		ntlmssp_parse.o \
 		ntlmssp_server.o
 REQUIRED_SUBSYSTEMS = AUTH
 # End MODULE gensec_ntlmssp
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index 0499d62565..8796441a22 100644
--- a/source4/build/smb_build/input.pm
+++ b/source4/build/smb_build/input.pm
@@ -148,7 +148,11 @@ sub check($$$$$)
 
 	foreach my $part (values %$INPUT) {
 		unless(defined($part->{NOPROTO})) {
-			$part->{NOPROTO} = "NO";
+			if ($part->{TYPE} eq "MODULE" or $part->{TYPE} eq "BINARY") {
+				$part->{NOPROTO} = "YES";
+			} else {
+				$part->{NOPROTO} = "NO";
+			}
 		}
 
 		if (defined($part->{PRIVATE_PROTO_HEADER})) {
diff --git a/source4/gtk/tools/gwcrontab.c b/source4/gtk/tools/gwcrontab.c
index 9ebc7f43fd..020bae30f2 100644
--- a/source4/gtk/tools/gwcrontab.c
+++ b/source4/gtk/tools/gwcrontab.c
@@ -32,7 +32,7 @@ static GtkWidget *entry_repeat_weekly;
 static GtkWidget *entry_repeat_monthly;
 static GtkWidget *delete;
 
-void update_joblist(void)
+static void update_joblist(void)
 {
 	TALLOC_CTX *mem_ctx = talloc_init("update_joblist");
 	NTSTATUS status;
diff --git a/source4/gtk/tools/gwsam.c b/source4/gtk/tools/gwsam.c
index 3764afe046..55e11471e2 100644
--- a/source4/gtk/tools/gwsam.c
+++ b/source4/gtk/tools/gwsam.c
@@ -31,13 +31,13 @@ GtkWidget *mainwin;
 GtkWidget *seldomain;
 static GtkWidget *mnu_disconnect;
 
-void update_grouplist(void)
+static void update_grouplist(void)
 {
 	if(!sam_pipe) return;
 	//FIXME
 }
 
-void update_userlist(void)
+static void update_userlist(void)
 {
 	NTSTATUS status;
 	struct samr_EnumDomainUsers r;
diff --git a/source4/include/includes.h b/source4/include/includes.h
index 058eb267a8..60e3fb034b 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -111,6 +111,7 @@ enum brl_type {
 #include "charset/charset.h"
 #include "structs.h"
 #include "util/util.h"
+#include "param/param.h"
 #include "libcli/util/nterr.h"
 #include "libcli/util/doserr.h"
 #include "librpc/ndr/libndr.h"
diff --git a/source4/kdc/kpasswdd.c b/source4/kdc/kpasswdd.c
index 8e6448435b..7538bc04ef 100644
--- a/source4/kdc/kpasswdd.c
+++ b/source4/kdc/kpasswdd.c
@@ -32,6 +32,7 @@
 #include "heimdal/lib/krb5/krb5-private.h"
 #include "auth/auth.h"
 #include "dsdb/samdb/samdb.h"
+#include "rpc_server/samr/proto.h"
 
 /* hold information about one kdc socket */
 struct kpasswd_socket {
diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index 82309ad470..9df95f4f2f 100644
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -46,6 +46,7 @@ OBJ_FILES = \
 # Start MODULE registry_rpc
 [MODULE::registry_rpc]
 INIT_FUNCTION = registry_rpc_init
+NOPROTO = NO
 OUTPUT_TYPE = MERGEDOBJ
 SUBSYSTEM = REGISTRY
 OBJ_FILES = \
diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk
index 81614ed647..0ab0b5f809 100644
--- a/source4/lib/util/config.mk
+++ b/source4/lib/util/config.mk
@@ -34,7 +34,9 @@ OBJ_FILES = xfile.o \
 		module.o
 REQUIRED_SUBSYSTEMS = \
 		CHARSET LIBREPLACE LIBCRYPTO EXT_LIB_DL LIBTALLOC \
-		SOCKET_WRAPPER CONFIG
+		SOCKET_WRAPPER CONFIG \
+# for the base64 functions
+		LIBLDB 
 
 [SUBSYSTEM::PIDFILE]
 OBJ_FILES = pidfile.o
diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c
index ce65a6e460..c76f8f7cde 100644
--- a/source4/libnet/libnet_vampire.c
+++ b/source4/libnet/libnet_vampire.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "libnet/libnet.h"
+#include "auth/gensec/schannel_proto.h"
 
 
 /**
diff --git a/source4/ntvfs/config.mk b/source4/ntvfs/config.mk
index 177ce5d77b..84ec59e028 100644
--- a/source4/ntvfs/config.mk
+++ b/source4/ntvfs/config.mk
@@ -19,6 +19,7 @@ REQUIRED_SUBSYSTEMS = \
 [MODULE::ntvfs_simple]
 INIT_FUNCTION = ntvfs_simple_init 
 SUBSYSTEM = NTVFS
+PRIVATE_PROTO_HEADER = simple/proto.h
 OBJ_FILES = \
 		simple/vfs_simple.o \
 		simple/svfs_util.o
@@ -40,6 +41,7 @@ OBJ_FILES = \
 [MODULE::ntvfs_ipc]
 SUBSYSTEM = NTVFS
 INIT_FUNCTION = ntvfs_ipc_init 
+PRIVATE_PROTO_HEADER = ipc/proto.h
 OBJ_FILES = \
 		ipc/vfs_ipc.o \
 		ipc/ipc_rap.o \
diff --git a/source4/ntvfs/ipc/ipc_rap.c b/source4/ntvfs/ipc/ipc_rap.c
index f97ae4cd89..5656a96621 100644
--- a/source4/ntvfs/ipc/ipc_rap.c
+++ b/source4/ntvfs/ipc/ipc_rap.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "libcli/rap/rap.h"
+#include "ntvfs/ipc/proto.h"
 
 #define NERR_Success 0
 #define NERR_badpass 86
diff --git a/source4/ntvfs/ipc/vfs_ipc.c b/source4/ntvfs/ipc/vfs_ipc.c
index dd7994c1fb..d5259bc9a6 100644
--- a/source4/ntvfs/ipc/vfs_ipc.c
+++ b/source4/ntvfs/ipc/vfs_ipc.c
@@ -29,6 +29,7 @@
 #include "dlinklist.h"
 #include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
+#include "ntvfs/ipc/proto.h"
 #include "rpc_server/dcerpc_server.h"
 
 #define IPC_BASE_FNUM 0x400
diff --git a/source4/ntvfs/simple/vfs_simple.c b/source4/ntvfs/simple/vfs_simple.c
index ad06a95041..ce14877277 100644
--- a/source4/ntvfs/simple/vfs_simple.c
+++ b/source4/ntvfs/simple/vfs_simple.c
@@ -34,6 +34,7 @@
 #include "dlinklist.h"
 #include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
+#include "ntvfs/simple/proto.h"
 
 #ifndef O_DIRECTORY
 #define O_DIRECTORY 0
diff --git a/source4/param/config.mk b/source4/param/config.mk
index 800e130e9e..7b97331310 100644
--- a/source4/param/config.mk
+++ b/source4/param/config.mk
@@ -3,4 +3,5 @@ OBJ_FILES = ../dynconfig.o \
 				loadparm.o \
 				params.o \
 				generic.o
-REQUIRED_SUBSYSTEMS = LIBBASIC DB_WRAP
+REQUIRED_SUBSYSTEMS = LIBBASIC 
+PRIVATE_PROTO_HEADER = param.h
diff --git a/source4/param/loadparm.h b/source4/param/loadparm.h
index 1bb0ed6618..02fc004f9a 100644
--- a/source4/param/loadparm.h
+++ b/source4/param/loadparm.h
@@ -71,10 +71,6 @@ struct parm_struct {
 #define FLAG_DEFAULT    0x4000 /* this option was a default */
 #define FLAG_CMDLINE    0x8000 /* this option was set from the command line */
 
-#ifndef GLOBAL_NAME
-#define GLOBAL_NAME "global"
-#endif
-
 #ifndef PRINTERS_NAME
 #define PRINTERS_NAME "printers"
 #endif
diff --git a/source4/rpc_server/config.mk b/source4/rpc_server/config.mk
index 73f61602bd..13b5a4d1f5 100644
--- a/source4/rpc_server/config.mk
+++ b/source4/rpc_server/config.mk
@@ -103,6 +103,7 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_samr
 [MODULE::dcerpc_samr]
 INIT_FUNCTION = dcerpc_server_samr_init
+PRIVATE_PROTO_HEADER = samr/proto.h
 SUBSYSTEM = DCERPC_SERVER
 OBJ_FILES = \
 		samr/dcesrv_samr.o \
diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index d506d9192d..1b13548c6b 100644
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -27,6 +27,7 @@
 #include "lib/ldb/include/ldb.h"
 #include "auth/auth.h"
 #include "dsdb/samdb/samdb.h"
+#include "rpc_server/samr/proto.h"
 
 struct server_pipe_state {
 	struct netr_Credential client_challenge;
diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index e9787eb041..6c109ff0c2 100644
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -32,6 +32,7 @@
 #include "ads.h"
 #include "dsdb/samdb/samdb.h"
 #include "libcli/ldap/ldap.h"
+#include "rpc_server/samr/proto.h"
 
 
 /*
diff --git a/source4/rpc_server/samr/samr_password.c b/source4/rpc_server/samr/samr_password.c
index cc0f0aa3b7..998005cb0e 100644
--- a/source4/rpc_server/samr/samr_password.c
+++ b/source4/rpc_server/samr/samr_password.c
@@ -31,6 +31,7 @@
 #include "libcli/ldap/ldap.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
+#include "rpc_server/samr/proto.h"
 
 /* 
   samr_ChangePasswordUser 
diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 47e4b99bec..c3365388d2 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -39,6 +39,7 @@ REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING LIBSAMBA3 LIBNET \
 # Start BINARY SMBSCRIPT
 [BINARY::smbscript]
 INSTALLDIR = BINDIR
+NOPROTO = NO
 OBJ_FILES = \
 		smbscript.o
 REQUIRED_SUBSYSTEMS = EJS LIBBASIC SMBCALLS CONFIG 
diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c
index 8e23ac244f..35cae68636 100644
--- a/source4/torture/gentest.c
+++ b/source4/torture/gentest.c
@@ -26,6 +26,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "auth/gensec/gensec.h"
+#include "torture/torture.h"
 
 #define NSERVERS 2
 #define NINSTANCES 2
diff --git a/source4/torture/nbench/nbio.c b/source4/torture/nbench/nbio.c
index 3e4c9a0f92..863ddae83f 100644
--- a/source4/torture/nbench/nbio.c
+++ b/source4/torture/nbench/nbio.c
@@ -26,6 +26,7 @@
 #include "dlinklist.h"
 #include "libcli/libcli.h"
 #include "libcli/raw/libcliraw.h"
+#include "torture/torture.h"
 
 #define MAX_FILES 100
 
diff --git a/source4/torture/rpc/samlogon.c b/source4/torture/rpc/samlogon.c
index 4dfba4a9fc..185a2a6870 100644
--- a/source4/torture/rpc/samlogon.c
+++ b/source4/torture/rpc/samlogon.c
@@ -28,6 +28,7 @@
 #include "lib/crypto/crypto.h"
 #include "lib/cmdline/popt_common.h"
 #include "torture/rpc/proto.h"
+#include "auth/gensec/schannel_proto.h"
 
 #define TEST_MACHINE_NAME "samlogontest"
 #define TEST_USER_NAME "samlogontestuser"
diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c
index f0f19f0818..0b4fb14fda 100644
--- a/source4/torture/rpc/samsync.c
+++ b/source4/torture/rpc/samsync.c
@@ -29,6 +29,7 @@
 #include "lib/crypto/crypto.h"
 #include "system/time.h"
 #include "torture/rpc/proto.h"
+#include "auth/gensec/schannel_proto.h"
 
 #define TEST_MACHINE_NAME "samsynctest"
 #define TEST_WKSTA_MACHINE_NAME "samsynctest2"
diff --git a/source4/torture/rpc/schannel.c b/source4/torture/rpc/schannel.c
index 3ad781c145..ee16d2de75 100644
--- a/source4/torture/rpc/schannel.c
+++ b/source4/torture/rpc/schannel.c
@@ -24,6 +24,7 @@
 #include "librpc/gen_ndr/ndr_netlogon.h"
 #include "torture/rpc/proto.h"
 #include "lib/cmdline/popt_common.h"
+#include "auth/gensec/schannel_proto.h"
 
 #define TEST_MACHINE_NAME "schannel"
 
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index b245492ad6..067af257fa 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -42,6 +42,7 @@
 #include "torture/com/proto.h"
 #include "torture/nbt/proto.h"
 #include "torture/libnet/proto.h"
+#include "torture/torture.h"
 
 int torture_nprocs=4;
 int torture_numops=10;