From 37fffa54cf7edb208dcb060c642f5b0acf11d4e6 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 1 Nov 2004 05:26:28 +0000 Subject: r3424: don't run mkproto.pl on pidl generated code, instead rely on pidl generating the prototypes itself (This used to be commit e694aeefe7c725d417abdd3c48d16ff1d932c223) --- source4/include/includes.h | 20 +++++++++++++------- source4/include/rewrite.h | 33 ++++++++++----------------------- source4/include/smb_interfaces.h | 10 ---------- 3 files changed, 23 insertions(+), 40 deletions(-) (limited to 'source4/include') diff --git a/source4/include/includes.h b/source4/include/includes.h index 9df5e23816..7ff466b7d7 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -651,13 +651,6 @@ extern int errno; #include "md5.h" #include "hmacmd5.h" -#include "libcli/auth/ntlmssp.h" -#include "libcli/auth/credentials.h" -#include "libcli/auth/kerberos.h" -#include "libcli/auth/gensec.h" -#include "libcli/auth/spnego.h" - -#include "auth/auth.h" #include "module.h" @@ -665,8 +658,21 @@ extern int errno; #include "mutex.h" +#include "librpc/ndr/libndr.h" +#include "librpc/gen_ndr/ndr_misc.h" +#include "librpc/gen_ndr/ndr_dcerpc.h" #include "librpc/rpc/dcerpc.h" +#include "librpc/ndr/ndr_sec.h" +#include "librpc/gen_ndr/tables.h" + +#include "libcli/auth/ntlmssp.h" +#include "libcli/auth/credentials.h" +#include "libcli/auth/kerberos.h" +#include "libcli/auth/gensec.h" +#include "libcli/auth/spnego.h" +#include "auth/auth.h" +#include "smb_interfaces.h" #include "smbd/server.h" #include "smbd/service.h" #include "rpc_server/dcerpc_server.h" diff --git a/source4/include/rewrite.h b/source4/include/rewrite.h index eb4419fcbd..599503be12 100644 --- a/source4/include/rewrite.h +++ b/source4/include/rewrite.h @@ -60,11 +60,18 @@ typedef struct data_blob { size_t length; } DATA_BLOB; +/* Globally Unique ID */ +#define GUID_SIZE 16 + +/* 64 bit time (100 nanosec) 1601 - cifs6.txt, section 3.5, page 30 */ +typedef uint64_t NTTIME; + +/* 8 byte aligned 'hyper' type from MS IDL */ +typedef uint64_t HYPER_T; + + #include "enums.h" #include "events.h" -#include "librpc/gen_ndr/ndr_misc.h" -#include "smb_interfaces.h" -#include "librpc/ndr/libndr.h" /* used for network interfaces */ struct interface @@ -75,26 +82,6 @@ struct interface struct in_addr nmask; }; -/* key and data in the connections database - used in smbstatus and smbd */ -struct connections_key { - pid_t pid; - int cnum; - fstring name; -}; - -struct connections_data { - int magic; - pid_t pid; - int cnum; - uid_t uid; - gid_t gid; - char name[24]; - char addr[24]; - char machine[FSTRING_LEN]; - time_t start; - uint32_t bcast_msg_flags; -}; - /* the following are used by loadparm for option lists */ typedef enum { diff --git a/source4/include/smb_interfaces.h b/source4/include/smb_interfaces.h index 771dce8803..bdf8282356 100644 --- a/source4/include/smb_interfaces.h +++ b/source4/include/smb_interfaces.h @@ -20,16 +20,6 @@ */ -/* Globally Unique ID */ -#define GUID_SIZE 16 - -/* 64 bit time (100 nanosec) 1601 - cifs6.txt, section 3.5, page 30 */ -typedef uint64_t NTTIME; - -/* 8 byte aligned 'hyper' type from MS IDL */ -typedef uint64_t HYPER_T; - - /* 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 -- cgit