svn commit: samba r3424 - in branches/SAMBA_4_0/source: include librpc librpc/ndr

[tridge at samba.org]

Author: tridge
Date: 2004-11-01 05:26:28 +0000 (Mon, 01 Nov 2004)
New Revision: 3424

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3424

Log:
don't run mkproto.pl on pidl generated code, instead rely on pidl generating the
prototypes itself




Modified:
   branches/SAMBA_4_0/source/include/includes.h
   branches/SAMBA_4_0/source/include/rewrite.h
   branches/SAMBA_4_0/source/include/smb_interfaces.h
   branches/SAMBA_4_0/source/librpc/config.m4
   branches/SAMBA_4_0/source/librpc/ndr/libndr.h


Changeset:
Modified: branches/SAMBA_4_0/source/include/includes.h
===================================================================
--- branches/SAMBA_4_0/source/include/includes.h	2004-11-01 05:25:05 UTC (rev 3423)
+++ branches/SAMBA_4_0/source/include/includes.h	2004-11-01 05:26:28 UTC (rev 3424)
@@ -651,22 +651,28 @@
 #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"
 
 #include "asn_1.h"
 
 #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"

Modified: branches/SAMBA_4_0/source/include/rewrite.h
===================================================================
--- branches/SAMBA_4_0/source/include/rewrite.h	2004-11-01 05:25:05 UTC (rev 3423)
+++ branches/SAMBA_4_0/source/include/rewrite.h	2004-11-01 05:26:28 UTC (rev 3424)
@@ -60,11 +60,18 @@
 	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 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
 {

Modified: branches/SAMBA_4_0/source/include/smb_interfaces.h
===================================================================
--- branches/SAMBA_4_0/source/include/smb_interfaces.h	2004-11-01 05:25:05 UTC (rev 3423)
+++ branches/SAMBA_4_0/source/include/smb_interfaces.h	2004-11-01 05:26:28 UTC (rev 3424)
@@ -20,17 +20,7 @@
 */
 
 
-/* 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
    on the wire in testsuite test code to ensure that we are

Modified: branches/SAMBA_4_0/source/librpc/config.m4
===================================================================
--- branches/SAMBA_4_0/source/librpc/config.m4	2004-11-01 05:25:05 UTC (rev 3423)
+++ branches/SAMBA_4_0/source/librpc/config.m4	2004-11-01 05:26:28 UTC (rev 3424)
@@ -4,8 +4,11 @@
 		[librpc/ndr/ndr.o
 		librpc/ndr/ndr_basic.o
 		librpc/ndr/ndr_sec.o
-		librpc/ndr/ndr_spoolss_buf.o
-		librpc/gen_ndr/tables.o
+		librpc/ndr/ndr_spoolss_buf.o])
+
+SMB_SUBSYSTEM_NOPROTO(LIBNDR_GEN)
+SMB_SUBSYSTEM(LIBNDR_GEN,[],
+		[librpc/gen_ndr/tables.o
 		librpc/gen_ndr/ndr_audiosrv.o
 		librpc/gen_ndr/ndr_dcerpc.o
 		librpc/gen_ndr/ndr_echo.o
@@ -59,4 +62,4 @@
 		librpc/rpc/dcerpc_sock.o])
 
 SMB_SUBSYSTEM(LIBRPC,[],[],[],
-		[LIBNDR_RAW LIBRPC_RAW])
+		[LIBNDR_RAW LIBNDR_GEN LIBRPC_RAW])

Modified: branches/SAMBA_4_0/source/librpc/ndr/libndr.h
===================================================================
--- branches/SAMBA_4_0/source/librpc/ndr/libndr.h	2004-11-01 05:25:05 UTC (rev 3423)
+++ branches/SAMBA_4_0/source/librpc/ndr/libndr.h	2004-11-01 05:26:28 UTC (rev 3424)
@@ -252,7 +252,3 @@
 typedef void (*ndr_print_function_t)(struct ndr_print *, const char *, int, void *);
 typedef void (*ndr_print_union_fn_t)(struct ndr_print *, const char *, uint32_t, void *);
 
-#include "librpc/ndr/ndr_sec.h"
-
-/* now pull in the individual parsers */
-#include "librpc/gen_ndr/tables.h"