removed more old code

(This used to be commit fbccf58539827ef368f8a0be122e45edcd0f070e)

8 files changed, 0 insertions, 977 deletions

diff --git a/source4/include/adt_tree.h b/source4/include/adt_tree.h
deleted file mode 100644
index b1bf7ad85d..0000000000
--- a/source4/include/adt_tree.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* 
- *  Unix SMB/CIFS implementation.
- *  Generic Abstract Data Types
- *  Copyright (C) Gerald Carter                     2002.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *  
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef ADT_TREE_H
-#define ADT_TREE_H
-
-typedef struct _tree_node {
-	struct _tree_node	*parent;
-	struct _tree_node	**children;
-	int 			num_children;
-	char			*key;
-	void			*data_p;
-} TREE_NODE;
-
-typedef struct _tree_root {
-	TREE_NODE	*root;
-	int 		(*compare)(void* x, void *y);
-	void		(*free)(void *p);
-} SORTED_TREE;
-
-#endif
diff --git a/source4/include/gums.h b/source4/include/gums.h
deleted file mode 100644
index ca124d7442..0000000000
--- a/source4/include/gums.h
+++ /dev/null
@@ -1,230 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   GUMS structures
-   Copyright (C) Simo Sorce 2002
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#ifndef _GUMS_H
-#define _GUMS_H
-
-#define GUMS_VERSION_MAJOR 0
-#define GUMS_VERSION_MINOR 1
-#define GUMS_OBJECT_VERSION	1
-
-#define GUMS_OBJ_DOMAIN			1
-#define GUMS_OBJ_NORMAL_USER		2
-#define GUMS_OBJ_GROUP			3
-#define GUMS_OBJ_ALIAS			4
-#define GUMS_OBJ_WORKSTATION_TRUST	5
-#define GUMS_OBJ_SERVER_TRUST		6
-#define GUMS_OBJ_DOMAIN_TRUST		7
-
-typedef struct gums_user
-{
-	DOM_SID *group_sid;		/* Primary Group SID */
-
-	NTTIME logon_time;		/* logon time */
-	NTTIME logoff_time;		/* logoff time */
-	NTTIME kickoff_time;		/* kickoff time */
-	NTTIME pass_last_set_time;	/* password last set time */
-	NTTIME pass_can_change_time;	/* password can change time */
-	NTTIME pass_must_change_time;	/* password must change time */
-
-	char *full_name;		/* user's full name string */
-	char *home_dir;			/* home directory string */
-	char *dir_drive;		/* home directory drive string */
-	char *logon_script;		/* logon script string */
-	char *profile_path;		/* profile path string */
-	char *workstations;		/* login from workstations string */
-	char *unknown_str;		/* don't know what this is, yet. */
-	char *munged_dial;		/* munged path name and dial-back tel number */
-		
-	DATA_BLOB lm_pw; 		/* .data is Null if no password */
-	DATA_BLOB nt_pw; 		/* .data is Null if no password */
-		
-	uint32 unknown_3;		/* 0x00ff ffff */
-		
-	uint16 logon_divs;		/* 168 - number of hours in a week */
-	uint32 hours_len;		/* normally 21 bytes */
-	uint8 *hours;
-		
-	uint32 unknown_5;		/* 0x0002 0000 */
-	uint32 unknown_6;		/* 0x0000 04ec */
-
-} GUMS_USER;
-
-typedef struct gums_group
-{
-	uint32 count;			/* Number of SIDs */
-	DOM_SID **members;		/* SID array */
-
-} GUMS_GROUP;
-
-union gums_obj_p {
-	gums_user *user;
-	gums_group *group;
-}
-
-typedef struct gums_object
-{
-	TALLOC_CTX *mem_ctx;
-
-	uint32 type;			/* Object Type */
-	uint32 version;			/* Object Version */
-	uint32 seq_num;			/* Object Sequence Number */
-
-	SEC_DESC *sec_desc;		/* Security Descriptor */
-
-	DOM_SID *sid;			/* Object Sid */
-	char *name;			/* Object Name */
-	char *description;		/* Object Description */
-
-	union gums_obj_p data;		/* Object Specific data */
-
-} GUMS_OBJECT;
-
-typedef struct gums_data_set
-{
-	int type; /* GUMS_SET_xxx */
-	void *data;
-
-} GUMS_DATA_SET;
-
-typedef struct gums_commit_set
-{
-	TALLOC_CTX *mem_ctx;
-
-	uint32 type;			/* Object type */
-	DOM_SID sid;			/* Object Sid */
-	uint32 count;			/* number of changes */
-	GUMS_DATA_SET **data;
-} GUMS_COMMIT_SET;
-
-typedef struct gums_privilege
-{
-	TALLOC_CTX *mem_ctx;
-
-	uint32 type;			/* Object Type */
-	uint32 version;			/* Object Version */
-	uint32 seq_num;			/* Object Sequence Number */
-
-	LUID_ATTR *privilege;		/* Privilege Type */
-	char *name;			/* Object Name */
-	char *description;		/* Object Description */
-
-	uint32 count;
-	DOM_SID **members;
-
-} GUMS_PRIVILEGE;
-
-
-typedef struct gums_functions
-{
-	/* Generic object functions */
-
-	NTSTATUS (*get_domain_sid) (DOM_SID **sid, const char* name);
-	NTSTATUS (*set_domain_sid) (const DOM_SID *sid);
-
-	NTSTATUS (*get_sequence_number) (void);
-
-	NTSTATUS (*new_object) (DOM_SID **sid, const char *name, const int obj_type);
-	NTSTATUS (*delete_object) (const DOM_SID *sid);
-
-	NTSTATUS (*get_object_from_sid) (GUMS_OBJECT **object, const DOM_SID *sid, const int obj_type);
-	NTSTATUS (*get_sid_from_name) (GUMS_OBJECT **object, const char *name);
-	/* This function is used to get the list of all objects changed since b_time, it is
-	   used to support PDC<->BDC synchronization */
-	NTSTATUS (*get_updated_objects) (GUMS_OBJECT **objects, const NTTIME base_time);
-
-	NTSTATUS (*enumerate_objects_start) (void *handle, const DOM_SID *sid, const int obj_type);
-	NTSTATUS (*enumerate_objects_get_next) (GUMS_OBJECT **object, void *handle);
-	NTSTATUS (*enumerate_objects_stop) (void *handle);
-
-	/* This function MUST be used ONLY by PDC<->BDC replication code or recovery tools.
-	   Never use this function to update an object in the database, use set_object_values() */
-	NTSTATUS (*set_object) (const GUMS_OBJECT *object);
-
-	/* set object values function */
-	NTSTATUS (*set_object_values) (DOM_SID *sid, uint32 count, GUMS_DATA_SET *data_set);
-
-	/* Group related functions */
-	NTSTATUS (*add_memberss_to_group) (const DOM_SID *group, const DOM_SID **members);
-	NTSTATUS (*delete_members_from_group) (const DOM_SID *group, const DOM_SID **members);
-	NTSTATUS (*enumerate_group_members) (DOM_SID **members, const DOM_SID *sid, const int type);
-
-	NTSTATUS (*get_sid_groups) (DOM_SID **groups, const DOM_SID *sid);
-
-	NTSTATUS (*lock_sid) (const DOM_SID *sid);
-	NTSTATUS (*unlock_sid) (const DOM_SID *sid);
-
-	/* privileges related functions */
-
-	NTSTATUS (*add_members_to_privilege) (const LUID_ATTR *priv, const DOM_SID **members);
-	NTSTATUS (*delete_members_from_privilege) (const LUID_ATTR *priv, const DOM_SID **members);
-	NTSTATUS (*enumerate_privilege_members) (DOM_SID **members, const LUID_ATTR *priv);
-	NTSTATUS (*get_sid_privileges) (DOM_SID **privs, const DOM_SID *sid);
-	/* warning!: set_privilege will overwrite a prior existing privilege if such exist */
-	NTSTATUS (*set_privilege) (GUMS_PRIVILEGE *priv);
-
-} GUMS_FUNCTIONS;
-
-/* define value types */
-
-#define GUMS_SET_PRIMARY_GROUP		1
-#define GUMS_SET_SEC_DESC		2
-
-/* user specific type values */
-#define GUMS_SET_LOGON_TIME		10  /* keep NTTIME consecutive */
-#define GUMS_SET_LOGOFF_TIME		11 /* too ease checking */
-#define GUMS_SET_KICKOFF_TIME		13
-#define GUMS_SET_PASS_LAST_SET_TIME	14
-#define GUMS_SET_PASS_CAN_CHANGE_TIME	15
-#define GUMS_SET_PASS_MUST_CHANGE_TIME	16 /* NTTIME end */
-
-#define GUMS_SET_NAME			20 /* keep strings consecutive */
-#define GUMS_SET_DESCRIPTION		21 /* too ease checking */
-#define GUMS_SET_FULL_NAME		22
-#define GUMS_SET_HOME_DIRECTORY		23
-#define GUMS_SET_DRIVE			24
-#define GUMS_SET_LOGON_SCRIPT		25
-#define GUMS_SET_PROFILE_PATH		26
-#define GUMS_SET_WORKSTATIONS		27
-#define GUMS_SET_UNKNOWN_STRING		28
-#define GUMS_SET_MUNGED_DIAL		29 /* strings end */
-
-#define GUMS_SET_LM_PASSWORD		40
-#define GUMS_SET_NT_PASSWORD		41
-#define GUMS_SET_PLAINTEXT_PASSWORD	42
-#define GUMS_SET_UNKNOWN_3		43
-#define GUMS_SET_LOGON_DIVS		44
-#define GUMS_SET_HOURS_LEN		45
-#define GUMS_SET_HOURS			46
-#define GUMS_SET_UNKNOWN_5		47
-#define GUMS_SET_UNKNOWN_6		48
-
-#define GUMS_SET_MUST_CHANGE_PASS	50
-#define GUMS_SET_CANNOT_CHANGE_PASS	51
-#define GUMS_SET_PASS_NEVER_EXPIRE	52
-#define GUMS_SET_ACCOUNT_DISABLED	53
-#define GUMS_SET_ACCOUNT_LOCKOUT	54
-
-/*group specific type values */
-#define GUMS_ADD_SID_LIST		60
-#define GUMS_DEL_SID_LIST		61
-#define GUMS_SET_SID_LIST		62
-
-#endif /* _GUMS_H */
diff --git a/source4/include/includes.h b/source4/include/includes.h
index 2b4eff6eb4..d8784f618b 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -734,7 +734,6 @@ extern int errno;
 #include "messages.h"
 #include "charset.h"
 #include "dynconfig.h"
-#include "adt_tree.h"
 
 #include "util_getent.h"
 
@@ -749,10 +748,6 @@ extern int errno;
 
 #include "msdfs.h"
 
-#include "mapping.h"
-
-#include "rap.h"
-
 #include "md5.h"
 #include "hmacmd5.h"
 
diff --git a/source4/include/mapping.h b/source4/include/mapping.h
deleted file mode 100644
index fd124034cf..0000000000
--- a/source4/include/mapping.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* 
- *  Unix SMB/CIFS implementation.
- *  RPC Pipe client / server routines
- *  Copyright (C) Andrew Tridgell              1992-2000,
- *  Copyright (C) Jean François Micouleau      1998-2001.
- *  
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *  
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#define PRIV_ALL_INDEX		5
-
-#define SE_PRIV_NONE		0x0000
-#define SE_PRIV_ADD_MACHINES	0x0006
-#define SE_PRIV_SEC_PRIV	0x0008
-#define SE_PRIV_TAKE_OWNER	0x0009
-#define SE_PRIV_ADD_USERS	0xff01
-#define SE_PRIV_PRINT_OPERATOR	0xff03
-#define SE_PRIV_ALL		0xffff
-
-#define ENUM_ONLY_MAPPED True
-#define ENUM_ALL_MAPPED False
-
-#define MAPPING_WITH_PRIV True
-#define MAPPING_WITHOUT_PRIV False
-
-#define PR_NONE                0x0000
-#define PR_LOG_ON_LOCALLY      0x0001
-#define PR_ACCESS_FROM_NETWORK 0x0002
-#define PR_LOG_ON_BATCH_JOB    0x0004
-#define PR_LOG_ON_SERVICE      0x0010
-
-
-typedef struct _GROUP_MAP {
-	struct pdb_methods *methods;
-	gid_t gid;
-	DOM_SID sid;
-	enum SID_NAME_USE sid_name_use;
-	fstring nt_name;
-	fstring comment;
-	uint32 systemaccount;
-} GROUP_MAP;
-
-typedef struct _PRIVS {
-	uint32 se_priv;
-	const char *priv;
-	const char *description;
-} PRIVS;
-
diff --git a/source4/include/rap.h b/source4/include/rap.h
deleted file mode 100755
index 993dfa7e33..0000000000
--- a/source4/include/rap.h
+++ /dev/null
@@ -1,507 +0,0 @@
-/* 
-   Samba Unix/Linux SMB client library 
-   RAP (SMB Remote Procedure Calls) defines and structures
-   Copyright (C) Steve French 2001  (sfrench@us.ibm.com)
-   Copyright (C) Jim McDonough 2001 (jmcd@us.ibm.com)
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#ifndef _RAP_H_
-#define _RAP_H_
-
-/*****************************************************/
-/*                                                   */
-/*   Additional RAP functionality                    */
-/*                                                   */
-/*   RAP is the original SMB RPC, documented         */
-/*   by Microsoft and X/Open in the 1990s and        */
-/*   supported by most SMB/CIFS servers although     */
-/*   it is unlikely that any one implementation      */
-/*   supports all RAP command codes since some       */
-/*   are quite obsolete and a few are specific       */
-/*   to a particular network operating system        */
-/*                                                   */ 
-/*   Although it has largely been replaced           */ 
-/*   for complex remote admistration and management  */
-/*   (of servers) by the relatively newer            */
-/*   DCE/RPC based remote API (which better handles  */
-/*   large >64K data structures), there are many     */
-/*   important administrative and resource location  */
-/*   tasks and user tasks (e.g. password change)     */
-/*   that are performed via RAP.                     */
-/*                                                   */
-/*   Although a few of the RAP calls are implemented */
-/*   in the Samba client library already (clirap.c)  */
-/*   the new ones are in clirap2.c for easy patching */
-/*   and integration and a corresponding header      */
-/*   file, rap.h, has been created.                  */
-/*                                                   */
-/*   This is based on data from the CIFS spec        */
-/*   and the LAN Server and LAN Manager              */
-/*   Programming Reference books and published       */
-/*   RAP document and CIFS forum postings and        */
-/*   lots of trial and error.  Additional            */
-/*   background information is available from the    */
-/*   X/Open reference book in their PC Interworking  */
-/*   series "IPC for SMB" and also from the          */
-/*   interoperability documentation in               */
-/*   ftp://ftp.microsoft.com/developr/drg/cifs       */
-/*                                                   */
-/*   Function names changed from API_ (as they are   */
-/*   in the CIFS specification to RAP_ in order      */
-/*   to avoid confusion with other API calls         */
-/*   sent via DCE RPC                                */
-/*                                                   */
-/*****************************************************/
-
-/*****************************************************/
-/*                                                   */
-/* Although without pound defines (of this header)   */
-/* cifsrap.c already includes support for:           */
-/*                                                   */
-/* WshareEnum (API number 0, level 1)                */
-/* NetServerEnum2 (API num 104, level 1)             */
-/* WWkstaUserLogon (132)                             */
-/* SamOEMchgPasswordUser2_P (214)                    */
-/*                                                   */
-/* and cifsprint.c already includes support for:     */
-/*                                                   */
-/* WPrintJobEnum (API num 76, level 2)               */
-/* WPrintJobDel  (API num 81)                        */
-/*                                                   */
-/*****************************************************/ 
-
-#define RAP_WshareEnum			        0
-#define RAP_WshareGetInfo			1
-#define RAP_WshareSetInfo			2
-#define RAP_WshareAdd				3
-#define RAP_WshareDel				4
-#define RAP_NetShareCheck			5
-#define RAP_WsessionEnum			6
-#define RAP_WsessionGetInfo			7
-#define RAP_WsessionDel		        	8
-#define RAP_WconnectionEnum			9
-#define RAP_WfileEnum				10
-#define RAP_WfileGetInfo			11
-#define RAP_WfileClose				12
-#define RAP_WserverGetInfo			13
-#define RAP_WserverSetInfo			14
-#define RAP_WserverDiskEnum			15
-#define RAP_WserverAdminCommand	        	16
-#define RAP_NetAuditOpen			17
-#define RAP_WauditClear			        18
-#define RAP_NetErrorLogOpen			19
-#define RAP_WerrorLogClear			20
-#define RAP_NetCharDevEnum			21
-#define RAP_NetCharDevGetInfo			22
-#define RAP_WCharDevControl			23
-#define RAP_NetCharDevQEnum			24
-#define RAP_NetCharDevQGetInfo	        	25
-#define RAP_WCharDevQSetInfo			26
-#define RAP_WCharDevQPurge			27
-#define RAP_WCharDevQPurgeSelf		        28
-#define RAP_WMessageNameEnum		        29
-#define RAP_WMessageNameGetInfo  		30
-#define RAP_WMessageNameAdd			31
-#define RAP_WMessageNameDel			32
-#define RAP_WMessageNameFwd			33
-#define RAP_WMessageNameUnFwd	        	34
-#define RAP_WMessageBufferSend	        	35
-#define RAP_WMessageFileSend			36
-#define RAP_WMessageLogFileSet	         	37
-#define RAP_WMessageLogFileGet		        38
-#define RAP_WServiceEnum			39
-#define RAP_WServiceInstall			40
-#define RAP_WServiceControl			41
-#define RAP_WAccessEnum	         		42
-#define RAP_WAccessGetInfo			43
-#define RAP_WAccessSetInfo			44
-#define RAP_WAccessAdd		        	45
-#define RAP_WAccessDel		        	46
-#define RAP_WGroupEnum			        47
-#define RAP_WGroupAdd		        	48
-#define RAP_WGroupDel				49
-#define RAP_WGroupAddUser			50
-#define RAP_WGroupDelUser			51
-#define RAP_WGroupGetUsers			52
-#define RAP_WUserEnum		         	53
-#define RAP_WUserAdd				54
-#define RAP_WUserDel				55
-#define RAP_WUserGetInfo			56
-#define RAP_WUserSetInfo			57
-#define RAP_WUserPasswordSet			58
-#define RAP_WUserGetGroups			59
-#define RAP_WWkstaSetUID			62
-#define RAP_WWkstaGetInfo			63
-#define RAP_WWkstaSetInfo			64
-#define RAP_WUseEnum				65
-#define RAP_WUseAdd				66
-#define RAP_WUseDel				67
-#define RAP_WUseGetInfo		        	68
-#define RAP_WPrintQEnum		        	69
-#define RAP_WPrintQGetInfo			70
-#define RAP_WPrintQSetInfo			71
-#define RAP_WPrintQAdd		        	72
-#define RAP_WPrintQDel				73
-#define RAP_WPrintQPause			74
-#define RAP_WPrintQContinue			75
-#define RAP_WPrintJobEnum			76
-#define RAP_WPrintJobGetInfo			77
-#define RAP_WPrintJobSetInfo_OLD		78
-#define RAP_WPrintJobDel			81
-#define RAP_WPrintJobPause			82
-#define RAP_WPrintJobContinue			83
-#define RAP_WPrintDestEnum			84
-#define RAP_WPrintDestGetInfo			85
-#define RAP_WPrintDestControl			86
-#define RAP_WProfileSave			87
-#define RAP_WProfileLoad			88
-#define RAP_WStatisticsGet			89
-#define RAP_WStatisticsClear			90
-#define RAP_NetRemoteTOD			91
-#define RAP_WNetBiosEnum			92
-#define RAP_WNetBiosGetInfo			93
-#define RAP_NetServerEnum			94
-#define RAP_I_NetServerEnum			95
-#define RAP_WServiceGetInfo			96
-#define RAP_WPrintQPurge			103
-#define RAP_NetServerEnum2			104
-#define RAP_WAccessGetUserPerms		        105
-#define RAP_WGroupGetInfo			106
-#define RAP_WGroupSetInfo			107
-#define RAP_WGroupSetUsers			108
-#define RAP_WUserSetGroups			109
-#define RAP_WUserModalsGet			110
-#define RAP_WUserModalsSet			111
-#define RAP_WFileEnum2		        	112
-#define RAP_WUserAdd2				113
-#define RAP_WUserSetInfo2			114
-#define RAP_WUserPasswordSet2			115
-#define RAP_I_NetServerEnum2			116
-#define RAP_WConfigGet2			        117
-#define RAP_WConfigGetAll2			118
-#define RAP_WGetDCName		        	119
-#define RAP_NetHandleGetInfo			120
-#define RAP_NetHandleSetInfo			121
-#define RAP_WStatisticsGet2			122
-#define RAP_WBuildGetInfo			123
-#define RAP_WFileGetInfo2			124
-#define RAP_WFileClose2			        125
-#define RAP_WNetServerReqChallenge		126
-#define RAP_WNetServerAuthenticate		127
-#define RAP_WNetServerPasswordSet		128
-#define RAP_WNetAccountDeltas			129
-#define RAP_WNetAccountSync			130
-#define RAP_WUserEnum2	        		131
-#define RAP_WWkstaUserLogon			132
-#define RAP_WWkstaUserLogoff			133
-#define RAP_WLogonEnum	         		134
-#define RAP_WErrorLogRead			135
-#define RAP_NetPathType		        	136
-#define RAP_NetPathCanonicalize		        137
-#define RAP_NetPathCompare			138
-#define RAP_NetNameValidate		        139
-#define RAP_NetNameCanonicalize		        140
-#define RAP_NetNameCompare		        141
-#define RAP_WAuditRead		        	142
-#define RAP_WPrintDestAdd			143
-#define RAP_WPrintDestSetInfo			144
-#define RAP_WPrintDestDel			145
-#define RAP_WUserValidate2			146
-#define RAP_WPrintJobSetInfo			147
-#define RAP_TI_NetServerDiskEnum		148
-#define RAP_TI_NetServerDiskGetInfo		149
-#define RAP_TI_FTVerifyMirror			150
-#define RAP_TI_FTAbortVerify			151
-#define RAP_TI_FTGetInfo			152
-#define RAP_TI_FTSetInfo			153
-#define RAP_TI_FTLockDisk			154
-#define RAP_TI_FTFixError			155
-#define RAP_TI_FTAbortFix			156
-#define RAP_TI_FTDiagnoseError			157
-#define RAP_TI_FTGetDriveStats			158
-#define RAP_TI_FTErrorGetInfo			160
-#define RAP_NetAccessCheck			163
-#define RAP_NetAlertRaise			164
-#define RAP_NetAlertStart			165
-#define RAP_NetAlertStop			166
-#define RAP_NetAuditWrite			167
-#define RAP_NetIRemoteAPI			168
-#define RAP_NetServiceStatus			169
-#define RAP_NetServerRegister			170
-#define RAP_NetServerDeregister		        171
-#define RAP_NetSessionEntryMake	        	172
-#define RAP_NetSessionEntryClear		173
-#define RAP_NetSessionEntryGetInfo		174
-#define RAP_NetSessionEntrySetInfo		175
-#define RAP_NetConnectionEntryMake		176
-#define RAP_NetConnectionEntryClear		177
-#define RAP_NetConnectionEntrySetInfo		178
-#define RAP_NetConnectionEntryGetInfo		179
-#define RAP_NetFileEntryMake			180
-#define RAP_NetFileEntryClear			181
-#define RAP_NetFileEntrySetInfo	        	182
-#define RAP_NetFileEntryGetInfo		        183
-#define RAP_AltSrvMessageBufferSend		184
-#define RAP_AltSrvMessageFileSend		185
-#define RAP_wI_NetRplWkstaEnum		        186
-#define RAP_wI_NetRplWkstaGetInfo		187
-#define RAP_wI_NetRplWkstaSetInfo		188
-#define RAP_wI_NetRplWkstaAdd		        189
-#define RAP_wI_NetRplWkstaDel			190
-#define RAP_wI_NetRplProfileEnum		191
-#define RAP_wI_NetRplProfileGetInfo		192
-#define RAP_wI_NetRplProfileSetInfo		193
-#define RAP_wI_NetRplProfileAdd	        	194
-#define RAP_wI_NetRplProfileDel			195
-#define RAP_wI_NetRplProfileClone		196
-#define RAP_wI_NetRplBaseProfileEnum		197
-#define RAP_WIServerSetInfo			201
-#define RAP_WPrintDriverEnum			205
-#define RAP_WPrintQProcessorEnum		206
-#define RAP_WPrintPortEnum			207
-#define RAP_WNetWriteUpdateLog	        	208
-#define RAP_WNetAccountUpdate			209
-#define RAP_WNetAccountConfirmUpdate		210
-#define RAP_WConfigSet				211
-#define RAP_WAccountsReplicate			212                      
-#define RAP_SamOEMChgPasswordUser2_P	        214
-#define RAP_NetServerEnum3			215
-#define RAP_WprintDriverGetInfo			250
-#define RAP_WprintDriverSetInfo			251
-#define RAP_WaliasAdd				252
-#define RAP_WaliasDel				253
-#define RAP_WaliasGetInfo			254
-#define RAP_WaliasSetInfo			255
-#define RAP_WaliasEnum	        		256
-#define RAP_WuserGetLogonAsn			257
-#define RAP_WuserSetLogonAsn			258
-#define RAP_WuserGetAppSel			259
-#define RAP_WuserSetAppSel			260
-#define RAP_WappAdd				261
-#define RAP_WappDel				262
-#define RAP_WappGetInfo		        	263
-#define RAP_WappSetInfo			        264
-#define RAP_WappEnum				265
-#define RAP_WUserDCDBInit			266
-#define RAP_WDASDAdd		        	267
-#define RAP_WDASDDel		        	268
-#define RAP_WDASDGetInfo			269
-#define RAP_WDASDSetInfo			270
-#define RAP_WDASDEnum			        271
-#define RAP_WDASDCheck	         		272
-#define RAP_WDASDCtl				273
-#define RAP_WuserRemoteLogonCheck		274
-#define RAP_WUserPasswordSet3			275
-#define RAP_WCreateRIPLMachine   		276
-#define RAP_WDeleteRIPLMachine		        277
-#define RAP_WGetRIPLMachineInfo	         	278
-#define RAP_WSetRIPLMachineInfo	         	279
-#define RAP_WEnumRIPLMachine	        	280
-#define RAP_I_ShareAdd		        	281
-#define RAP_AliasEnum		         	282
-#define RAP_WaccessApply			283
-#define RAP_WPrt16Query			        284
-#define RAP_WPrt16Set				285
-#define RAP_WUserDel100		        	286
-#define RAP_WUserRemoteLogonCheck2		287
-#define RAP_WRemoteTODSet			294
-#define RAP_WprintJobMoveAll			295
-#define RAP_W16AppParmAdd			296
-#define RAP_W16AppParmDel			297
-#define RAP_W16AppParmGet			298
-#define RAP_W16AppParmSet			299
-#define RAP_W16RIPLMachineCreate		300
-#define RAP_W16RIPLMachineGetInfo		301
-#define RAP_W16RIPLMachineSetInfo		302
-#define RAP_W16RIPLMachineEnum		        303
-#define RAP_W16RIPLMachineListParmEnum	        304
-#define RAP_W16RIPLMachClassGetInfo		305
-#define RAP_W16RIPLMachClassEnum		306
-#define RAP_W16RIPLMachClassCreate		307
-#define RAP_W16RIPLMachClassSetInfo		308
-#define RAP_W16RIPLMachClassDelete		309
-#define RAP_W16RIPLMachClassLPEnum		310
-#define RAP_W16RIPLMachineDelete		311
-#define RAP_W16WSLevelGetInfo	         	312
-#define RAP_WserverNameAdd			313
-#define RAP_WserverNameDel			314
-#define RAP_WserverNameEnum			315
-#define RAP_I_WDASDEnum	         		316
-#define RAP_WDASDEnumTerminate	         	317
-#define RAP_WDASDSetInfo2			318
-#define MAX_API					318
-
-
-/* Parameter description strings for RAP calls   */
-/* Names are defined name for RAP call with _REQ */
-/* appended to end.                              */
-
-#define RAP_WFileEnum2_REQ	"zzWrLehb8g8"
-#define RAP_WFileGetInfo2_REQ	"DWrLh"
-#define RAP_WFileClose2_REQ     "D"  	
-
-#define RAP_NetGroupEnum_REQ    "WrLeh"
-#define RAP_NetGroupAdd_REQ     "WsT"
-#define RAP_NetGroupDel_REQ     "z"
-#define RAP_NetGroupAddUser_REQ "zz"
-#define RAP_NetGroupDelUser_REQ "zz"
-#define RAP_NetGroupGetUsers_REQ "zWrLeh"
-#define RAP_NetGroupSetUsers_REQ "zWsTW"
-
-#define RAP_NetUserAdd2_REQ       "WsTWW"
-#define RAP_NetUserEnum_REQ       "WrLeh"
-#define RAP_NetUserEnum2_REQ      "WrLDieh"
-#define RAP_NetUserGetGroups_REQ  "zWrLeh"
-#define RAP_NetUserSetGroups_REQ  "zWsTW"
-#define RAP_NetUserPasswordSet_REQ "zb16b16w"
-#define RAP_NetUserPasswordSet2_REQ "zb16b16WW"
-#define RAP_SAMOEMChgPasswordUser2_REQ "B516B16"
-#define RAP_NetUserValidate2_REQ    "Wb62WWrLhWW"
-
-#define RAP_NetServerEnum2_REQ  "WrLehDz"
-#define RAP_WserverGetInfo_REQ  "WrLh"
-#define RAP_NetWkstatGetInfo    "WrLh"
-
-#define RAP_WShareAdd_REQ       "WsT"
-#define RAP_WShareEnum_REQ      "WrLeh"
-#define RAP_WShareDel_REQ       "zW"
-#define RAP_WWkstaGetInfo_REQ   "WrLh"
-
-#define RAP_NetPrintQEnum_REQ   "WrLeh"
-#define RAP_NetPrintQGetInfo_REQ "zWrLh"
-
-#define RAP_NetServerAdminCommand_REQ "zhrLeh"
-#define RAP_NetServiceEnum_REQ  "WrLeh"
-#define RAP_NetServiceControl_REQ "zWWrL"
-#define RAP_NetServiceInstall_REQ "zF88sg88T"
-#define RAP_NetServiceGetInfo_REQ "zWrLh"
-#define RAP_NetSessionEnum_REQ  "WrLeh"
-#define RAP_NetSessionGetInfo_REQ "zWrLh"
-#define RAP_NetSessionDel_REQ   "zW"
-
-#define RAP_NetConnectionEnum_REQ "zWrLeh"
-
-#define RAP_NetWkstaUserLogoff_REQ "zzWb38WrLh"
-
-/* Description strings for returned data in RAP calls */
-/* I use all caps here in part to avoid accidental    */
-/* name collisions */
-
-#define RAP_FILE_INFO_L2        "D"
-#define RAP_FILE_INFO_L3        "DWWzz"
-
-#define RAP_GROUP_INFO_L0       "B21"
-#define RAP_GROUP_INFO_L1       "B21Bz"
-#define RAP_GROUP_USERS_INFO_0  "B21"
-#define RAP_GROUP_USERS_INFO_1  "B21BN"
-
-#define RAP_USER_INFO_L0        "B21"
-#define RAP_USER_INFO_L1        "B21BB16DWzzWz"
-
-#define RAP_SERVER_INFO_L0      "B16"
-#define RAP_SERVER_INFO_L1      "B16BBDz"
-#define RAP_SERVER_INFO_L2 "B16BBDzDDDWWzWWWWWWWB21BzWWWWWWWWWWWWWWWWWWWWWWz"
-#define RAP_SERVER_INFO_L3 "B16BBDzDDDWWzWWWWWWWB21BzWWWWWWWWWWWWWWWWWWWWWWzDWz"
-#define RAP_SERVICE_INFO_L0     "B16"
-#define RAP_SERVICE_INFO_L2     "B16WDWB64"
-#define RAP_SHARE_INFO_L0       "B13"
-#define RAP_SHARE_INFO_L1	"B13BWz"
-#define RAP_SHARE_INFO_L2	"B13BWzWWWzB9B"
-
-#define RAP_PRINTQ_INFO_L2      "B13BWWWzzzzzWN"
-#define RAP_SMB_PRINT_JOB_L1    "WB21BB16B10zWWzDDz"
-
-#define RAP_SESSION_INFO_L2      "zzWWWDDDz"
-#define RAP_CONNECTION_INFO_L1   "WWWWDzz"
-
-#define RAP_USER_LOGOFF_INFO_L1     "WDW"
-
-#define RAP_WKSTA_INFO_L1       "WDzzzzBBDWDWWWWWWWWWWWWWWWWWWWzzWzzW"
-#define RAP_WKSTA_INFO_L10      "zzzBBzz"
-
-/* BB explicit packing would help in structs below */
-
-/* sizes of fixed-length fields, including null terminator */
-#define RAP_GROUPNAME_LEN 21
-#define RAP_USERNAME_LEN 21
-#define RAP_SHARENAME_LEN 13
-#define RAP_UPASSWD_LEN 16 /* user password */
-#define RAP_SPASSWD_LEN 9 /* share password */
-#define RAP_MACHNAME_LEN 16
-#define RAP_SRVCNAME_LEN 16
-#define RAP_SRVCCMNT_LEN 64
-#define RAP_DATATYPE_LEN 10
-
-
-typedef struct rap_group_info_1
-{
-    char   group_name[RAP_GROUPNAME_LEN];
-    char   reserved1;
-    char * comment;
-} RAP_GROUP_INFO_1;
-
-typedef struct rap_user_info_1
-{
-    char   user_name[RAP_USERNAME_LEN];
-    char   reserved1;
-    char   passwrd[RAP_UPASSWD_LEN];
-    uint32 pwage;
-    uint16 priv;
-    char * home_dir;
-    char * comment;
-    uint16 userflags;
-    char * logon_script;
-} RAP_USER_INFO_1;
-
-typedef struct rap_service_info_2
-{
-    char   service_name[RAP_SRVCNAME_LEN];
-    uint16 status;
-    uint32 installcode;
-    uint16 process_num;
-    char * comment;
-} RAP_SERVICE_INFO_2;
-
-
-typedef struct rap_share_info_0
-{
-    char   share_name[RAP_SHARENAME_LEN];
-} RAP_SHARE_INFO_0;
-
-typedef struct rap_share_info_1
-{
-    char   share_name[RAP_SHARENAME_LEN];
-    char   reserved1;
-    uint16 share_type;
-    char * comment;
-} RAP_SHARE_INFO_1;
-
-typedef struct rap_share_info_2
-{
-    char   share_name[RAP_SHARENAME_LEN];
-    char   reserved1;
-    uint16 share_type;
-    char * comment;
-    uint16 perms;
-    uint16 maximum_users;
-    uint16 active_users;
-    char * path;
-    char   password[RAP_SPASSWD_LEN];
-    char   reserved2;
-} RAP_SHARE_INFO_2;
-
-#endif /* _RAP_H_ */
diff --git a/source4/include/rpc_dce.h b/source4/include/rpc_dce.h
deleted file mode 100644
index 405bcc0caa..0000000000
--- a/source4/include/rpc_dce.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   SMB parameters and setup
-   Copyright (C) Andrew Tridgell 1992-1997
-   Copyright (C) Luke Kenneth Casson Leighton 1996-1997
-   Copyright (C) Paul Ashton 1997
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#ifndef _DCE_RPC_H /* _DCE_RPC_H */
-#define _DCE_RPC_H 
-
-#include "rpc_misc.h"  /* this only pulls in STRHDR */
-
-
-
-
-#endif /* _DCE_RPC_H */
diff --git a/source4/include/rpc_misc.h b/source4/include/rpc_misc.h
index ac8a3c80c8..8e7da30adc 100644
--- a/source4/include/rpc_misc.h
+++ b/source4/include/rpc_misc.h
@@ -21,7 +21,6 @@
 */
 
 #include "ntdomain.h"
-#include "rpc_dce.h"
 
 #ifndef _RPC_MISC_H /* _RPC_MISC_H */
 #define _RPC_MISC_H 
@@ -80,15 +79,4 @@
 #define USER_RID_TYPE 0
 #define GROUP_RID_TYPE 1
 
-/* DOM_SID2 - security id */
-typedef struct sid_info_2
-{
-	uint32 num_auths; /* length, bytes, including length of len :-) */
-
-	DOM_SID sid;
-
-} DOM_SID2;
-
-
-
 #endif /* _RPC_MISC_H */
diff --git a/source4/include/tdbsam2.h b/source4/include/tdbsam2.h
deleted file mode 100644
index 0ca9d34618..0000000000
--- a/source4/include/tdbsam2.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Unix SMB/CIFS implementation. 
- * tdbsam2 genstruct enabled header file
- * Copyright (C) Simo Sorce 2002
- * 
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 675
- * Mass Ave, Cambridge, MA 02139, USA.
- */
-
-
-/* ALL strings assumes UTF8 as encoding */
-
-GENSTRUCT struct tdbsam2_domain_data {
-	uint32 xcounter;		/* counter to be updated at any change */
-
-	SEC_DESC *sec_desc;		/* Security Descriptor */
-	DOM_SID *user_sid;		/* The User SID */
-	char *name; _NULLTERM		/* NT User Name */
-	char *description; _NULLTERM	/* Descritpion (Gecos) */
-};
-
-GENSTRUCT struct tdbsam2_user_data {
-	uint32 xcounter;		/* counter to be updated at any change */
-
-	SEC_DESC *sec_desc;		/* Security Descriptor */
-	DOM_SID *user_sid;		/* The User SID */
-	char *name; _NULLTERM		/* NT User Name */
-	char *description; _NULLTERM	/* Descritpion (Gecos) */
-
-	DOM_SID *group_sid;		/* The Primary Group SID */
-
-	NTTIME *logon_time;
-	NTTIME *logoff_time;
-	NTTIME *kickoff_time;
-	NTTIME *pass_last_set_time;
-	NTTIME *pass_can_change_time;
-	NTTIME *pass_must_change_time;
-	
-	char *full_name; _NULLTERM	/* The Full Name */
-	char *home_dir; _NULLTERM	/* Home Directory */
-	char *dir_drive; _NULLTERM	/* Drive Letter the home should be mapped to */
-	char *logon_script; _NULLTERM	/* Logon script path */
-	char *profile_path; _NULLTERM	/* Profile is stored here */
-	char *workstations; _NULLTERM	/* List of Workstation names the user is allowed to LogIn */
-	char *unknown_str; _NULLTERM	/* Guess ... Unknown */
-	char *munged_dial; _NULLTERM	/* Callback Number */
-
-	/* passwords are 16 byte leght, pointer is null if no password */
-	uint8 *lm_pw_ptr; _LEN(16)	/* Lanman hashed password */
-	uint8 *nt_pw_ptr; _LEN(16)	/* NT hashed password */
-
-	uint16 logon_divs;		/* 168 - num of hours in a week */
-	uint32 hours_len;		/* normally 21 */
-	uint8 *hours; _LEN(hours_len)	/* normally 21 bytes (depends on hours_len) */
-
-	uint32 unknown_3;		/* 0x00ff ffff */
-	uint32 unknown_5;		/* 0x0002 0000 */
-	uint32 unknown_6;		/* 0x0000 04ec */
-};	
-
-GENSTRUCT struct tdbsam2_group_data {
-	uint32 xcounter;		/* counter to be updated at any change */
-
-	SEC_DESC *sec_desc;		/* Security Descriptor */
-	DOM_SID *group_sid;		/* The Group SID */
-	char *name; _NULLTERM		/* NT User Name */
-	char *description; _NULLTERM	/* Descritpion (Gecos) */
-
-	uint32 count;			/* number of sids */
-	DOM_SID **members; _LEN(count)	/* SID array */
-};
-
-GENSTRUCT struct tdbsam2_privilege_data {
-	uint32 xcounter;		/* counter to be updated at any change */
-
-	LUID_ATTR *privilege;		/* Privilege */
-	char *name; _NULLTERM		/* NT User Name */
-	char *description; _NULLTERM	/* Descritpion (Gecos) */
-
-	uint32 count;			/* number of sids */
-	DOM_SID **members; _LEN(count)	/* SID array */
-};
-