r3425: got rid of a bunch of cruft from rewrite.h

(This used to be commit 3f902f8d851d32fa81d89ed61bfda6edaea00984)

2 files changed, 13 insertions, 112 deletions

diff --git a/source4/include/rewrite.h b/source4/include/rewrite.h
index 599503be12..584cc215f9 100644
--- a/source4/include/rewrite.h
+++ b/source4/include/rewrite.h
@@ -51,89 +51,9 @@ typedef int BOOL;
 #include "debug.h"
 #include "doserr.h"
 
-/* for compatibility */
-#define SID_NAME_USE samr_SidType
-
-/* used to hold an arbitrary blob of data */
-typedef struct data_blob {
-	uint8_t *data;
-	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"
 
-/* used for network interfaces */
-struct interface
-{
-	struct interface *next, *prev;
-	struct in_addr ip;
-	struct in_addr bcast;
-	struct in_addr nmask;
-};
-
-/* the following are used by loadparm for option lists */
-typedef enum
-{
-  P_BOOL,P_BOOLREV,P_CHAR,P_INTEGER,P_OCTAL,P_LIST,
-  P_STRING,P_USTRING,P_ENUM,P_SEP
-} parm_type;
-
-typedef enum
-{
-  P_LOCAL,P_GLOBAL,P_SEPARATOR,P_NONE
-} parm_class;
-
-struct enum_list {
-	int value;
-	const char *name;
-};
-
-struct parm_struct
-{
-	const char *label;
-	parm_type type;
-	parm_class class;
-	void *ptr;
-	BOOL (*special)(const char *, char **);
-	const struct enum_list *enum_list;
-	uint_t flags;
-	union {
-		BOOL bvalue;
-		int ivalue;
-		char *svalue;
-		char cvalue;
-		char **lvalue;
-	} def;
-};
-
-struct bitmap {
-	uint32_t *b;
-	uint_t n;
-};
-
-#define FLAG_BASIC 	0x0001 /* fundamental options */
-#define FLAG_SHARE 	0x0002 /* file sharing options */
-#define FLAG_PRINT 	0x0004 /* printing options */
-#define FLAG_GLOBAL 	0x0008 /* local options that should be globally settable in SWAT */
-#define FLAG_WIZARD 	0x0010 /* Parameters that the wizard will operate on */
-#define FLAG_ADVANCED 	0x0020 /* Parameters that the wizard will operate on */
-#define FLAG_DEVELOPER 	0x0040 /* Parameters that the wizard will operate on */
-#define FLAG_DEPRECATED 0x1000 /* options that should no longer be used */
-#define FLAG_HIDE  	0x2000 /* options that should be hidden in SWAT */
-#define FLAG_DOS_STRING 0x4000 /* convert from UNIX to DOS codepage when reading this string. */
-#define FLAG_CMDLINE    0x8000 /* this option was set from the command line */
-
 #ifndef LOCKING_VERSION
 #define LOCKING_VERSION 4
 #endif /* LOCKING_VERSION */
@@ -196,42 +116,10 @@ struct nmb_name {
 };
 
 
-/* A netbios node status array element. */
-struct node_status {
-	char name[16];
-	uint8_t type;
-	uint8_t flags;
-};
-
 #include "rpc_secdes.h"
 
 #include "client.h"
 
-/*
-   Do you want session setups at user level security with a invalid
-   password to be rejected or allowed in as guest? WinNT rejects them
-   but it can be a pain as it means "net view" needs to use a password
-
-   You have 3 choices in the setting of map_to_guest:
-
-   "NEVER_MAP_TO_GUEST" means session setups with an invalid password
-   are rejected. This is the default.
-
-   "MAP_TO_GUEST_ON_BAD_USER" means session setups with an invalid password
-   are rejected, unless the username does not exist, in which case it
-   is treated as a guest login
-
-   "MAP_TO_GUEST_ON_BAD_PASSWORD" means session setups with an invalid password
-   are treated as a guest login
-
-   Note that map_to_guest only has an effect in user or server
-   level security.
-*/
-
-#define NEVER_MAP_TO_GUEST 0
-#define MAP_TO_GUEST_ON_BAD_USER 1
-#define MAP_TO_GUEST_ON_BAD_PASSWORD 2
-
 #define SAFE_NETBIOS_CHARS ". -_"
 
 /* generic iconv conversion structure */
diff --git a/source4/include/smb.h b/source4/include/smb.h
index 623316087c..bc9eb2acb8 100644
--- a/source4/include/smb.h
+++ b/source4/include/smb.h
@@ -200,6 +200,19 @@ typedef struct nt_user_token {
 	struct dom_sid **user_sids;
 } NT_USER_TOKEN;
 
+/* used to hold an arbitrary blob of data */
+typedef struct data_blob {
+	uint8_t *data;
+	size_t length;
+} DATA_BLOB;
+
+/* 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;
+
+
 /* the basic packet size, assuming no words or bytes. Does not include the NBT header */
 #define MIN_SMB_SIZE 35