r4: merge in the SAMBA_3_0 branch from cvs

to checkout try this:

svn co svn+ssh://svn.samba.org/home/svn/samba/branches/SAMBA_3_0 samba-3_0-work

metze

18 files changed, 53 insertions, 915 deletions

diff --git a/source/include/auth.h b/source/include/auth.h
index 27cdc1e3f5f..8f52512e6a0 100644
--- a/source/include/auth.h
+++ b/source/include/auth.h
@@ -27,37 +27,17 @@ typedef struct normal_string
 	char *str;
 } AUTH_STR;
 
-/* AUTH_UNISTR - unicode string or buffer */
-typedef struct unicode_string
-{
-	int len;
-	uchar *unistr;
-} AUTH_UNISTR;
-
-typedef struct interactive_password
-{
-	OWF_INFO          lm_owf;              /* LM OWF Password */
-	OWF_INFO          nt_owf;              /* NT OWF Password */
-} auth_interactive_password;
-
-#define AUTH_FLAG_NONE        0x000000
-#define AUTH_FLAG_PLAINTEXT   0x000001
-#define AUTH_FLAG_LM_RESP     0x000002
-#define AUTH_FLAG_NTLM_RESP   0x000004
-#define AUTH_FLAG_NTLMv2_RESP 0x000008
-
 typedef struct auth_usersupplied_info
 {
 	
  	DATA_BLOB lm_resp;
 	DATA_BLOB nt_resp;
-	auth_interactive_password * interactive_password;
+ 	DATA_BLOB lm_interactive_pwd;
+	DATA_BLOB nt_interactive_pwd;
  	DATA_BLOB plaintext_password;
 	
 	BOOL encrypted;
 	
-	uint32 auth_flags;
-
 	AUTH_STR           client_domain;          /* domain name string */
 	AUTH_STR           domain;               /* domain name after mapping */
 	AUTH_STR           internal_username;    /* username after mapping */
@@ -86,7 +66,6 @@ typedef struct auth_serversupplied_info
 	/* NT group information taken from the info3 structure */
 	
 	NT_USER_TOKEN *ptok;
-	PRIVILEGE_SET *privs;
 	
 	DATA_BLOB nt_session_key;
 	DATA_BLOB lm_session_key;
diff --git a/source/include/genparser.h b/source/include/genparser.h
deleted file mode 100644
index f28cd78249d..00000000000
--- a/source/include/genparser.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-   Copyright (C) Andrew Tridgell <genstruct@tridgell.net> 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 _GENPARSER_H
-#define _GENPARSER_H
-
-/* these macros are needed for genstruct auto-parsers */
-#ifndef GENSTRUCT
-#define GENSTRUCT
-#define _LEN(x)
-#define _NULLTERM
-#endif
-
-/*
-  automatic marshalling/unmarshalling system for C structures
-*/
-
-/* flag to mark a fixed size array as actually being null terminated */
-#define FLAG_NULLTERM 1
-#define FLAG_ALWAYS 2
-
-struct enum_struct {
-	const char *name;
-	unsigned value;
-};
-
-/* intermediate dumps are stored in one of these */
-struct parse_string {
-	unsigned allocated;
-	unsigned length;
-	char *s;
-};
-
-typedef int (*gen_dump_fn)(TALLOC_CTX *, struct parse_string *, const char *ptr, unsigned indent);
-typedef int (*gen_parse_fn)(TALLOC_CTX *, char *ptr, const char *str);
-
-/* genstruct.pl generates arrays of these */
-struct parse_struct {
-	const char *name;
-	unsigned ptr_count;
-	unsigned size;
-	unsigned offset;
-	unsigned array_len;
-	const char *dynamic_len;
-	unsigned flags;
-	gen_dump_fn dump_fn;
-	gen_parse_fn parse_fn;
-};
-
-#define DUMP_PARSE_DECL(type) \
-  int gen_dump_ ## type(TALLOC_CTX *, struct parse_string *, const char *, unsigned); \
-  int gen_parse_ ## type(TALLOC_CTX *, char *, const char *);
-
-DUMP_PARSE_DECL(char)
-DUMP_PARSE_DECL(int)
-DUMP_PARSE_DECL(unsigned)
-DUMP_PARSE_DECL(double)
-DUMP_PARSE_DECL(float)
-
-#define gen_dump_unsigned_char gen_dump_char
-#define gen_parse_unsigned_char gen_parse_char
-
-#endif /* _GENPARSER_H */
diff --git a/source/include/genparser_samba.h b/source/include/genparser_samba.h
deleted file mode 100644
index 213d51da876..00000000000
--- a/source/include/genparser_samba.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-   Copyright (C) Simo Sorce <idra@samba.org> 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 _GENPARSER_SAMBA_H
-#define _GENPARSER_SAMBA_H
-
-const struct parse_struct pinfo_security_ace_info[] = {
-{"type", 0, sizeof(uint8), offsetof(struct security_ace_info, type), 0, NULL, 0, gen_dump_uint8, gen_parse_uint8},
-{"flags", 0, sizeof(uint8), offsetof(struct security_ace_info, flags), 0, NULL, 0, gen_dump_uint8, gen_parse_uint8},
-{"size", 0, sizeof(uint16), offsetof(struct security_ace_info, size), 0, NULL, 0, gen_dump_uint16, gen_parse_uint16},
-{"info", 0, sizeof(char), offsetof(struct security_ace_info, info), 0, NULL, 0, gen_dump_SEC_ACCESS, gen_parse_SEC_ACCESS},
-{"obj_flags", 0, sizeof(uint32), offsetof(struct security_ace_info, obj_flags), 0, NULL, 0, gen_dump_uint32, gen_parse_uint32},
-{"obj_guid", 0, sizeof(char), offsetof(struct security_ace_info, obj_guid), 0, NULL, 0, gen_dump_GUID, gen_parse_GUID},
-{"inh_guid", 0, sizeof(char), offsetof(struct security_ace_info, inh_guid), 0, NULL, 0, gen_dump_GUID, gen_parse_GUID},
-{"trustee", 0, sizeof(char), offsetof(struct security_ace_info, trustee), 0, NULL, 0, gen_dump_DOM_SID, gen_parse_DOM_SID},
-{NULL, 0, 0, 0, 0, NULL, 0, NULL, NULL}};
-
-const struct parse_struct pinfo_security_acl_info[] = {
-{"revision", 0, sizeof(uint16), offsetof(struct security_acl_info, revision), 0, NULL, 0, gen_dump_uint16, gen_parse_uint16},
-{"size", 0, sizeof(uint16), offsetof(struct security_acl_info, size), 0, NULL, 0, gen_dump_uint16, gen_parse_uint16},
-{"num_aces", 0, sizeof(uint32), offsetof(struct security_acl_info, num_aces), 0, NULL, 0, gen_dump_uint32, gen_parse_uint32},
-{"ace", 1, sizeof(struct security_ace_info), offsetof(struct security_acl_info, ace), 0, "size", 0, gen_dump_SEC_ACE, gen_parse_SEC_ACE},
-{NULL, 0, 0, 0, 0, NULL, 0, NULL, NULL}};
-
-const struct parse_struct pinfo_security_descriptor_info[] = {
-{"revision", 0, sizeof(uint16), offsetof(struct security_descriptor_info, revision), 0, NULL, 0, gen_dump_uint16, gen_parse_uint16},
-{"type", 0, sizeof(uint16), offsetof(struct security_descriptor_info, type), 0, NULL, 0, gen_dump_uint16, gen_parse_uint16},
-{"off_owner_sid", 0, sizeof(uint32), offsetof(struct security_descriptor_info, off_owner_sid), 0, NULL, 0, gen_dump_uint32, gen_parse_uint32},
-{"off_grp_sid", 0, sizeof(uint32), offsetof(struct security_descriptor_info, off_grp_sid), 0, NULL, 0, gen_dump_uint32, gen_parse_uint32},
-{"off_sacl", 0, sizeof(uint32), offsetof(struct security_descriptor_info, off_sacl), 0, NULL, 0, gen_dump_uint32, gen_parse_uint32},
-{"off_dacl", 0, sizeof(uint32), offsetof(struct security_descriptor_info, off_dacl), 0, NULL, 0, gen_dump_uint32, gen_parse_uint32},
-{"dacl", 1, sizeof(struct security_acl_info), offsetof(struct security_descriptor_info, dacl), 0, NULL, 0, gen_dump_SEC_ACL, gen_parse_SEC_ACL},
-{"sacl", 1, sizeof(struct security_acl_info), offsetof(struct security_descriptor_info, sacl), 0, NULL, 0, gen_dump_SEC_ACL, gen_parse_SEC_ACL},
-{"owner_sid", 1, sizeof(char), offsetof(struct security_descriptor_info, owner_sid), 0, NULL, 0, gen_dump_DOM_SID, gen_parse_DOM_SID},
-{"grp_sid", 1, sizeof(char), offsetof(struct security_descriptor_info, grp_sid), 0, NULL, 0, gen_dump_DOM_SID, gen_parse_DOM_SID},
-{NULL, 0, 0, 0, 0, NULL, 0, NULL, NULL}};
-
-const struct parse_struct pinfo_luid_attr_info[] = {
-{"attr", 0, sizeof(uint32), offsetof(struct LUID_ATTR, attr), 0, NULL, 0, gen_dump_uint32, gen_parse_uint32},
-{"luid", 1, sizeof(LUID), offsetof(struct LUID_ATTR, luid), 0, NULL, 0, gen_dump_LUID, gen_parse_LUID},
-{NULL, 0, 0, 0, 0, NULL, 0, NULL, NULL}};
-
-const struct parse_struct pinfo_data_blob_info[] = {
-{"length", 0, sizeof(int), offsetof(DATA_BLOB, length), 0, NULL, 0, gen_dump_int, gen_parse_int},
-{"data", 1, sizeof(char), offsetof(DATA_BLOB, data), 0, "length", 0, gen_dump_char, gen_parse_char},
-{NULL, 0, 0, 0, 0, NULL, 0, NULL, NULL}};
-
-#endif /* _GENPARSER_SAMBA_H */
diff --git a/source/include/gums.h b/source/include/gums.h
deleted file mode 100644
index d16a839bc4b..00000000000
--- a/source/include/gums.h
+++ /dev/null
@@ -1,272 +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_PRIVILEGE_VERSION	1
-#define GUMS_INTERFACE_VERSION	1
-
-#define GUMS_OBJ_DOMAIN			0x10
-#define GUMS_OBJ_NORMAL_USER		0x20
-#define GUMS_OBJ_GROUP			0x30
-#define GUMS_OBJ_ALIAS			0x31
-
-/* define value types */
-#define GUMS_SET_PRIMARY_GROUP		0x1
-#define GUMS_SET_SEC_DESC		0x2
-
-#define GUMS_SET_NAME			0x10
-#define GUMS_SET_DESCRIPTION		0x11
-#define GUMS_SET_FULL_NAME		0x12
-
-/* user specific type values */
-#define GUMS_SET_LOGON_TIME		0x20
-#define GUMS_SET_LOGOFF_TIME		0x21
-#define GUMS_SET_KICKOFF_TIME		0x23
-#define GUMS_SET_PASS_LAST_SET_TIME	0x24
-#define GUMS_SET_PASS_CAN_CHANGE_TIME	0x25
-#define GUMS_SET_PASS_MUST_CHANGE_TIME	0x26
-
-
-#define GUMS_SET_HOME_DIRECTORY		0x31
-#define GUMS_SET_DRIVE			0x32
-#define GUMS_SET_LOGON_SCRIPT		0x33
-#define GUMS_SET_PROFILE_PATH		0x34
-#define GUMS_SET_WORKSTATIONS		0x35
-#define GUMS_SET_UNKNOWN_STRING		0x36
-#define GUMS_SET_MUNGED_DIAL		0x37
-
-#define GUMS_SET_LM_PASSWORD		0x40
-#define GUMS_SET_NT_PASSWORD		0x41
-#define GUMS_SET_PLAINTEXT_PASSWORD	0x42
-#define GUMS_SET_UNKNOWN_3		0x43
-#define GUMS_SET_LOGON_DIVS		0x44
-#define GUMS_SET_HOURS_LEN		0x45
-#define GUMS_SET_HOURS			0x46
-#define GUMS_SET_BAD_PASSWORD_COUNT	0x47
-#define GUMS_SET_LOGON_COUNT		0x48
-#define GUMS_SET_UNKNOWN_6		0x49
-
-#define GUMS_SET_MUST_CHANGE_PASS	0x50
-#define GUMS_SET_CANNOT_CHANGE_PASS	0x51
-#define GUMS_SET_PASS_NEVER_EXPIRE	0x52
-#define GUMS_SET_ACCOUNT_DISABLED	0x53
-#define GUMS_SET_ACCOUNT_LOCKOUT	0x54
-
-/*group specific type values */
-#define GUMS_ADD_SID_LIST		0x60
-#define GUMS_DEL_SID_LIST		0x61
-#define GUMS_SET_SID_LIST		0x62
-
-GENSTRUCT 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; _NULLTERM	/* user's full name string */
-	char *home_dir; _NULLTERM	/* home directory string */
-	char *dir_drive; _NULLTERM	/* home directory drive string */
-	char *logon_script; _NULLTERM	/* logon script string */
-	char *profile_path; _NULLTERM	/* profile path string */
-	char *workstations; _NULLTERM	/* login from workstations string */
-	char *unknown_str; _NULLTERM	/* don't know what this is, yet. */
-	char *munged_dial; _NULLTERM	/* 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 */
-
-	uint16 acct_ctrl;		/* account type & status flags */
-	uint16 logon_divs;		/* 168 - number of hours in a week */
-	uint32 hours_len;		/* normally 21 bytes */
-	uint8 *hours; _LEN(hours_len)	/* normally 21 bytes (depends on hours_len) */
-
-	uint16 bad_password_count;	/* 0 */
-	uint16 logon_count;		/* 0 */
-	uint32 unknown_3;		/* 0x00ff ffff */
-	uint32 unknown_6;		/* 0x0000 04ec */
-
-};
-
-GENSTRUCT struct gums_group
-{
-	uint32 count;			/* Number of SIDs */
-	DOM_SID *members; _LEN(count)	/* SID array */
-
-};
-
-GENSTRUCT struct gums_domain
-{
-	uint32 next_rid;
-
-};
-
-GENSTRUCT 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; _NULLTERM		/* Object Name - it should be in DOMAIN\NAME format */
-	char *description; _NULLTERM	/* Object Description */
-
-	struct gums_user *user;
-	struct gums_group *group;
-	struct gums_domain *domain;
-
-};
-
-GENSTRUCT struct gums_privilege
-{
-	TALLOC_CTX *mem_ctx;
-
-	uint32 version;			/* Object Version */
-	uint32 seq_num;			/* Object Sequence Number */
-
-	char *name; _NULLTERM		/* Object Name */
-	char *description; _NULLTERM	/* Object Description */
-
-	LUID_ATTR *privilege;		/* Privilege Type */
-
-	uint32 count;
-	DOM_SID *members; _LEN(count)
-
-};
-
-typedef struct gums_user GUMS_USER;
-typedef struct gums_group GUMS_GROUP;
-typedef struct gums_domain GUMS_DOMAIN;
-typedef struct gums_object GUMS_OBJECT;
-typedef struct gums_privilege GUMS_PRIVILEGE;
-
-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_priv_commit_set
-{
-	TALLOC_CTX *mem_ctx;
-
-	uint32 type;			/* Object type */
-	char *name;			/* Object Sid */
-	uint32 count;			/* number of changes */
-	GUMS_DATA_SET *data;
-
-} GUMS_PRIV_COMMIT_SET;
-
-
-typedef struct gums_functions
-{
-	/* module data */
-	TALLOC_CTX *mem_ctx;
-	char *name;
-	void *private_data;
-	void (*free_private_data)(void **);
-
-	/* 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_object_from_name) (GUMS_OBJECT **object, const char *domain, const char *name, const int obj_type);
-	/* 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) (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_members_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 (*get_privilege) (GUMS_OBJECT **object, const char *name);
-	NTSTATUS (*add_members_to_privilege) (const char *name, const DOM_SID **members);
-	NTSTATUS (*delete_members_from_privilege) (const char *name, const DOM_SID **members);
-	NTSTATUS (*enumerate_privilege_members) (const char *name, DOM_SID **members);
-	NTSTATUS (*get_sid_privileges) (const DOM_SID *sid, const char **privs);
-
-	/* warning!: set_privilege will overwrite a prior existing privilege if such exist */
-	NTSTATUS (*set_privilege) (GUMS_PRIVILEGE *priv);
-
-} GUMS_FUNCTIONS;
-
-typedef NTSTATUS (*gums_init_function)(
-			struct gums_functions *,
-			const char *);
-
-struct gums_init_function_entry {
-
-	const char *name;
-	gums_init_function init_fn;
-	struct gums_init_function_entry *prev, *next;
-};
-
-#endif /* _GUMS_H */
diff --git a/source/include/includes.h b/source/include/includes.h
index dd93c813d3d..ea8eb1a3043 100644
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -779,8 +779,6 @@ extern int errno;
 
 #include "version.h"
 
-#include "privileges.h"
-
 #include "smb.h"
 
 #include "nameserv.h"
@@ -789,6 +787,8 @@ extern int errno;
 
 #include "byteorder.h"
 
+#include "privileges.h"
+
 #include "rpc_creds.h"
 
 #include "mapping.h"
@@ -801,10 +801,6 @@ extern int errno;
 
 #include "rpc_secdes.h"
 
-#include "genparser.h"
-
-#include "gums.h"
-
 #include "nt_printing.h"
 
 #include "msdfs.h"
@@ -889,7 +885,6 @@ struct smb_ldap_privates;
 /* forward declarations from smbldap.c */
 
 #include "smbldap.h"
-#include "modconf.h"
 
 /***** automatically generated prototypes *****/
 #ifndef NO_PROTO_H
diff --git a/source/include/modconf.h b/source/include/modconf.h
deleted file mode 100644
index f5cc5ef4889..00000000000
--- a/source/include/modconf.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef _MODCONF_H_
-#define _MODCONF_H_
-/* 
-   Unix SMB/CIFS implementation.
-
-   ModConf headers
-
-   Copyright (C) Simo Sorce 2003
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-   
-   This library 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
-   Library General Public License for more details.
-   
-   You should have received a copy of the GNU Library General Public
-   License along with this library; if not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA  02111-1307, USA.   
-*/
-
-#define SAMBA_CONFIG_INTERFACE_VERSION	1
-
-/* Filled out by config backends */
-struct config_functions {
-	NTSTATUS (*init)(char *params);
-	NTSTATUS (*load)(BOOL (*sfunc)(const char *),BOOL (*pfunc)(const char *, const char *));
-	NTSTATUS (*close)(void);
-};
-#endif /* _MODCONF_H_ */
diff --git a/source/include/ntdomain.h b/source/include/ntdomain.h
index 4e6795a85d5..b1a4107980d 100644
--- a/source/include/ntdomain.h
+++ b/source/include/ntdomain.h
@@ -23,22 +23,6 @@
 #ifndef _NT_DOMAIN_H /* _NT_DOMAIN_H */
 #define _NT_DOMAIN_H 
 
-struct uuid
-{
-  uint32 time_low;
-  uint16 time_mid;
-  uint16 time_hi_and_version;
-  uint8  clock_seq[2];
-  uint8  node[6];
-};
-#define UUID_SIZE 16
-
-#define UUID_FLAT_SIZE 16
-typedef struct uuid_flat
-{
-	uint8 info[UUID_FLAT_SIZE];
-} UUID_FLAT;
-
 /* dce/rpc support */
 #include "rpc_dce.h"
 
@@ -382,6 +366,13 @@ typedef struct
 
 } rid_name;
 
+struct acct_info
+{
+    fstring acct_name; /* account name */
+    fstring acct_desc; /* account name */
+    uint32 rid; /* domain-relative RID */
+};
+
 /*
  * higher order functions for use with msrpc client code
  */
@@ -411,7 +402,6 @@ typedef struct
 #include "rpc_dfs.h"
 #include "rpc_ds.h"
 #include "rpc_echo.h"
-#include "rpc_epmapper.h"
 #include "rpc_shutdown.h"
 
 #endif /* _NT_DOMAIN_H */
diff --git a/source/include/passdb.h b/source/include/passdb.h
index baf0e23a20c..75c4fd215bf 100644
--- a/source/include/passdb.h
+++ b/source/include/passdb.h
@@ -115,15 +115,6 @@ enum pdb_group_elements {
 	PDB_GROUP_COUNT
 };
 
-enum pdb_trust_passwd_elements {
-	PDB_TRUST_PASS,
-	PDB_TRUST_SID,
-	PDB_TRUST_NAME,
-	PDB_TRUST_MODTIME,
-	PDB_TRUST_FLAGS,
-	
-	PDB_TRUST_COUNT
-};
 
 enum pdb_value_state {
 	PDB_DEFAULT=0,
@@ -233,41 +224,6 @@ typedef struct sam_group {
 } SAM_GROUP;
 
 
-typedef struct _GROUP_INFO {
-	struct pdb_methods *methods;
-	DOM_SID sid;
-	enum SID_NAME_USE sid_name_use;
-	fstring nt_name;
-	fstring comment;
-} GROUP_INFO;
-
-struct acct_info
-{
-    fstring acct_name; /* account name */
-    fstring acct_desc; /* account name */
-    uint32 rid; /* domain-relative RID */
-};
-
-typedef struct sam_trust_passwd {
-	TALLOC_CTX *mem_ctx;
-	
-	void (*free_fn)(struct sam_trust_passwd **);
-	
-	struct pdb_methods *methods;
-
-	struct trust_passwd_data {
-		uint16 flags;			/* flags */
-		size_t uni_name_len;		/* unicode name length */
-		smb_ucs2_t uni_name[32];	/* unicode domain name */
-		fstring pass;			/* trust password */
-		time_t mod_time;		/* last change time */
-		DOM_SID domain_sid;		/* trusted domain sid */
-	} private;
-
-} SAM_TRUST_PASSWD;
-
-
-
 /*****************************************************************
  Functions to be implemented by the new (v2) passdb API 
 ****************************************************************/
@@ -277,7 +233,7 @@ typedef struct sam_trust_passwd {
  * this SAMBA will load. Increment this if *ANY* changes are made to the interface. 
  */
 
-#define PASSDB_INTERFACE_VERSION 7
+#define PASSDB_INTERFACE_VERSION 4
 
 typedef struct pdb_context 
 {
@@ -303,8 +259,6 @@ typedef struct pdb_context
 	
 	NTSTATUS (*pdb_delete_sam_account)(struct pdb_context *, SAM_ACCOUNT *username);
 
-	/* group mapping functions: to be removed */
-	
 	NTSTATUS (*pdb_getgrsid)(struct pdb_context *context, GROUP_MAP *map, DOM_SID sid);
 	
 	NTSTATUS (*pdb_getgrgid)(struct pdb_context *context, GROUP_MAP *map, gid_t gid);
@@ -325,96 +279,6 @@ typedef struct pdb_context
 					   GROUP_MAP **rmap, int *num_entries,
 					   BOOL unix_only);
 
-	NTSTATUS (*pdb_find_alias)(struct pdb_context *context,
-				   const char *name, DOM_SID *sid);
-
-	NTSTATUS (*pdb_create_alias)(struct pdb_context *context,
-				     const char *name, uint32 *rid);
-
-	NTSTATUS (*pdb_delete_alias)(struct pdb_context *context,
-				     const DOM_SID *sid);
-
-	NTSTATUS (*pdb_enum_aliases)(struct pdb_context *context,
-				     const DOM_SID *domain_sid,
-				     uint32 start_idx, uint32 num_entries,
-				     uint32 *num_aliases,
-				     struct acct_info **aliases);
-
-	NTSTATUS (*pdb_get_aliasinfo)(struct pdb_context *context,
-				      const DOM_SID *sid,
-				      struct acct_info *info);
-
-	NTSTATUS (*pdb_set_aliasinfo)(struct pdb_context *context,
-				      const DOM_SID *sid,
-				      struct acct_info *info);
-
-	NTSTATUS (*pdb_add_aliasmem)(struct pdb_context *context,
-				     const DOM_SID *alias,
-				     const DOM_SID *member);
-
-	NTSTATUS (*pdb_del_aliasmem)(struct pdb_context *context,
-				     const DOM_SID *alias,
-				     const DOM_SID *member);
-
-	NTSTATUS (*pdb_enum_aliasmem)(struct pdb_context *context,
-				      const DOM_SID *alias,
-				      DOM_SID **members, int *num_members);
-
-	NTSTATUS (*pdb_enum_alias_memberships)(struct pdb_context *context,
-					       const DOM_SID *alias,
-					       DOM_SID **aliases,
-					       int *num);
-
-	/* group functions */
-
-	NTSTATUS (*pdb_get_group_info_by_sid)(struct pdb_context *context, GROUP_INFO *info, const DOM_SID *group);
-
-	NTSTATUS (*pdb_get_group_list)(struct pdb_context *context, GROUP_INFO **info, const enum SID_NAME_USE sid_name_use, int *num_groups);
-
-	NTSTATUS (*pdb_get_group_sids)(struct pdb_context *context, const DOM_SID *group, DOM_SID **members, int *num_members);
-
-	NTSTATUS (*pdb_add_group)(struct pdb_context *context, const SAM_GROUP *group);
-
-	NTSTATUS (*pdb_update_group)(struct pdb_context *context, const SAM_GROUP *group);
-
-	NTSTATUS (*pdb_delete_group)(struct pdb_context *context, const DOM_SID *group);
-
-	NTSTATUS (*pdb_add_sid_to_group)(struct pdb_context *context, const DOM_SID *group, const DOM_SID *member);
-
-	NTSTATUS (*pdb_remove_sid_from_group)(struct pdb_context *context, const DOM_SID *group, const DOM_SID *member);
-
-	NTSTATUS (*pdb_get_group_info_by_name)(struct pdb_context *context, GROUP_INFO *info, const char *name);
-
-	NTSTATUS (*pdb_get_group_info_by_nt_name)(struct pdb_context *context, GROUP_INFO *info, const char *nt_name);
-
-	NTSTATUS (*pdb_get_group_uids)(struct pdb_context *context, const DOM_SID *group, uid_t **members, int *num_members);
-
-	/* trust password functions */
-	
-	NTSTATUS (*pdb_settrustpwent)(struct pdb_context *context);
-
-	NTSTATUS (*pdb_gettrustpwent)(struct pdb_context *context, SAM_TRUST_PASSWD *trust);
-	
-	NTSTATUS (*pdb_gettrustpwnam)(struct pdb_context *context, SAM_TRUST_PASSWD *trust, const char *dom_name);
-	
-	NTSTATUS (*pdb_gettrustpwsid)(struct pdb_context *context, SAM_TRUST_PASSWD *trust, const DOM_SID *sid);
-	
-	NTSTATUS (*pdb_add_trust_passwd)(struct pdb_context *context, SAM_TRUST_PASSWD* trust);
-	
-	NTSTATUS (*pdb_update_trust_passwd)(struct pdb_context *context, SAM_TRUST_PASSWD* trust);
-	
-	NTSTATUS (*pdb_delete_trust_passwd)(struct pdb_context *context, SAM_TRUST_PASSWD* trust);
-
-	/* privileges functions */
-
-	NTSTATUS (*pdb_add_sid_to_privilege)(struct pdb_context *context, const char *priv_name, const DOM_SID *sid);
-
-	NTSTATUS (*pdb_remove_sid_from_privilege)(struct pdb_context *context, const char *priv_name, const DOM_SID *sid);
-
-	NTSTATUS (*pdb_get_privilege_set)(struct pdb_context *context, DOM_SID *user_sids, int num_sids, PRIVILEGE_SET *privs);
-	
-	NTSTATUS (*pdb_get_privilege_entry)(struct pdb_context *context, const char *privname, char **sid_list);
-	
 	void (*free_fn)(struct pdb_context **);
 	
 	TALLOC_CTX *mem_ctx;
@@ -445,9 +309,7 @@ typedef struct pdb_methods
 	NTSTATUS (*update_sam_account)(struct pdb_methods *, SAM_ACCOUNT *sampass);
 	
 	NTSTATUS (*delete_sam_account)(struct pdb_methods *, SAM_ACCOUNT *username);
-
-	/* group mapping functions: to be removed */
-
+	
 	NTSTATUS (*getgrsid)(struct pdb_methods *methods, GROUP_MAP *map, DOM_SID sid);
 
 	NTSTATUS (*getgrgid)(struct pdb_methods *methods, GROUP_MAP *map, gid_t gid);
@@ -468,92 +330,9 @@ typedef struct pdb_methods
 				       GROUP_MAP **rmap, int *num_entries,
 				       BOOL unix_only);
 
-	NTSTATUS (*find_alias)(struct pdb_methods *methods,
-			       const char *name, DOM_SID *sid);
-
-	NTSTATUS (*create_alias)(struct pdb_methods *methods,
-				 const char *name, uint32 *rid);
-
-	NTSTATUS (*delete_alias)(struct pdb_methods *methods,
-				 const DOM_SID *sid);
-
-	NTSTATUS (*enum_aliases)(struct pdb_methods *methods,
-				 const DOM_SID *domain_sid,
-				 uint32 start_idx, uint32 max_entries,
-				 uint32 *num_aliases, struct acct_info **info);
-
-	NTSTATUS (*get_aliasinfo)(struct pdb_methods *methods,
-				  const DOM_SID *sid,
-				  struct acct_info *info);
-
-	NTSTATUS (*set_aliasinfo)(struct pdb_methods *methods,
-				  const DOM_SID *sid,
-				  struct acct_info *info);
-
-	NTSTATUS (*add_aliasmem)(struct pdb_methods *methods,
-				 const DOM_SID *alias, const DOM_SID *member);
-	NTSTATUS (*del_aliasmem)(struct pdb_methods *methods,
-				 const DOM_SID *alias, const DOM_SID *member);
-	NTSTATUS (*enum_aliasmem)(struct pdb_methods *methods,
-				  const DOM_SID *alias, DOM_SID **members,
-				  int *num_members);
-	NTSTATUS (*enum_alias_memberships)(struct pdb_methods *methods,
-					   const DOM_SID *sid,
-					   DOM_SID **aliases, int *num);
-
-	/* group functions */
-
-	NTSTATUS (*get_group_info_by_sid)(struct pdb_methods *methods, GROUP_INFO *info, const DOM_SID *group);
-
-	NTSTATUS (*get_group_list)(struct pdb_methods *methods, GROUP_INFO **info, const enum SID_NAME_USE sid_name_use, int *num_groups);
-
-	NTSTATUS (*get_group_sids)(struct pdb_methods *methods, const DOM_SID *group, DOM_SID **members, int *num_members);
-
-	NTSTATUS (*add_group)(struct pdb_methods *methods, const SAM_GROUP *group);
-
-	NTSTATUS (*update_group)(struct pdb_methods *methods, const SAM_GROUP *group);
-
-	NTSTATUS (*delete_group)(struct pdb_methods *methods, const DOM_SID *group);
-
-	NTSTATUS (*add_sid_to_group)(struct pdb_methods *methods, const DOM_SID *group, const DOM_SID *member);
-
-	NTSTATUS (*remove_sid_from_group)(struct pdb_methods *methods, const DOM_SID *group, const DOM_SID *member);
-
-	NTSTATUS (*get_group_info_by_name)(struct pdb_methods *methods, GROUP_INFO *info, const char *name);
-
-	NTSTATUS (*get_group_info_by_nt_name)(struct pdb_methods *methods, GROUP_INFO *info, const char *nt_name);
-
-	NTSTATUS (*get_group_uids)(struct pdb_methods *methods, const DOM_SID *group, uid_t **members, int *num_members);
-
 	void *private_data;  /* Private data of some kind */
 	
 	void (*free_private_data)(void **);
-	
-	/* trust password functions */
-
-	NTSTATUS (*settrustpwent)(struct pdb_methods *methods);
-
-	NTSTATUS (*gettrustpwent)(struct pdb_methods *methods, SAM_TRUST_PASSWD *trust);
-	
-	NTSTATUS (*gettrustpwnam)(struct pdb_methods *methods, SAM_TRUST_PASSWD *trust, const char *name);
-	
-	NTSTATUS (*gettrustpwsid)(struct pdb_methods *methods, SAM_TRUST_PASSWD *trust, const DOM_SID *sid);
-	
-	NTSTATUS (*add_trust_passwd)(struct pdb_methods *methods, const SAM_TRUST_PASSWD* trust);
-	
-	NTSTATUS (*update_trust_passwd)(struct pdb_methods *methods, const SAM_TRUST_PASSWD* trust);
-	
-	NTSTATUS (*delete_trust_passwd)(struct pdb_methods *methods, const SAM_TRUST_PASSWD* trust);
-
-	/* privileges functions */
-
-	NTSTATUS (*add_sid_to_privilege)(struct pdb_methods *methods, const char *priv_name, const DOM_SID *sid);
-
-	NTSTATUS (*remove_sid_from_privilege)(struct pdb_methods *methods, const char *priv_name, const DOM_SID *sid);
-
-	NTSTATUS (*get_privilege_set)(struct pdb_methods *methods, DOM_SID *user_sids, int num_sids, PRIVILEGE_SET *privs);
-
-	NTSTATUS (*get_privilege_entry)(struct pdb_methods *methods, const char *privname, char **sid_list);
 
 } PDB_METHODS;
 
diff --git a/source/include/privileges.h b/source/include/privileges.h
index 289afa234ec..b7e1b44c2af 100644
--- a/source/include/privileges.h
+++ b/source/include/privileges.h
@@ -23,39 +23,15 @@
 #ifndef PRIVILEGES_H
 #define PRIVILEGES_H
 
-#define PRIV_ALL_INDEX		30
+#define PRIV_ALL_INDEX		5
 
-#define SE_NONE				0
-#define SE_ASSIGN_PRIMARY_TOKEN		1
-#define SE_CREATE_TOKEN			2
-#define SE_LOCK_MEMORY			3
-#define SE_INCREASE_QUOTA		4
-#define SE_UNSOLICITED_INPUT		5
-#define SE_MACHINE_ACCOUNT		6
-#define SE_TCB				7
-#define SE_SECURITY			8
-#define SE_TAKE_OWNERSHIP		9
-#define SE_LOAD_DRIVER			10
-#define SE_SYSTEM_PROFILE		11
-#define SE_SYSTEM_TIME			12
-#define SE_PROF_SINGLE_PROCESS		13
-#define SE_INC_BASE_PRIORITY		14
-#define SE_CREATE_PAGEFILE		15
-#define SE_CREATE_PERMANENT		16
-#define SE_BACKUP			17
-#define SE_RESTORE			18
-#define SE_SHUTDOWN			19
-#define SE_DEBUG			20
-#define SE_AUDIT			21
-#define SE_SYSTEM_ENVIRONMENT		22
-#define SE_CHANGE_NOTIFY		23
-#define SE_REMOTE_SHUTDOWN		24
-#define SE_UNDOCK			25
-#define SE_SYNC_AGENT			26
-#define SE_ENABLE_DELEGATION		27
-#define SE_PRINT_OPERATOR		28
-#define SE_ADD_USERS			29
-#define SE_ALL_PRIVS			0xffff
+#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 PR_NONE                0x0000
 #define PR_LOG_ON_LOCALLY      0x0001
@@ -63,11 +39,6 @@
 #define PR_LOG_ON_BATCH_JOB    0x0004
 #define PR_LOG_ON_SERVICE      0x0010
 
-#ifndef _BOOL
-typedef int BOOL;
-#define _BOOL       /* So we don't typedef BOOL again in vfs.h */
-#endif
-
 typedef struct LUID
 {
 	uint32 low;
@@ -78,7 +49,7 @@ typedef struct LUID_ATTR
 {
 	LUID luid;
 	uint32 attr;
-} LUID_ATTR;
+} LUID_ATTR ;
 
 typedef struct privilege_set
 {
diff --git a/source/include/rpc_dce.h b/source/include/rpc_dce.h
index 8266fc861f1..52fe08d8753 100644
--- a/source/include/rpc_dce.h
+++ b/source/include/rpc_dce.h
@@ -87,15 +87,29 @@ enum netsec_direction
 /* #define MAX_PDU_FRAG_LEN 0x1630		this is what wnt sets */
 #define MAX_PDU_FRAG_LEN 0x10b8			/* this is what w2k sets */
 
+/*
+ * Actual structure of a DCE UUID
+ */
+
+typedef struct rpc_uuid
+{
+  uint32 time_low;
+  uint16 time_mid;
+  uint16 time_hi_and_version;
+  uint8 remaining[8];
+} RPC_UUID;
+
+#define RPC_UUID_LEN 16
+
 /* RPC_IFACE */
 typedef struct rpc_iface_info
 {
-  struct uuid uuid;  /* 16 bytes of rpc interface identification */
+  RPC_UUID uuid;    /* 16 bytes of rpc interface identification */
   uint32 version;    /* the interface version number */
 
 } RPC_IFACE;
 
-#define RPC_IFACE_LEN (UUID_SIZE + 4)
+#define RPC_IFACE_LEN (RPC_UUID_LEN + 4)
 
 struct pipe_id_info
 {
diff --git a/source/include/rpc_ds.h b/source/include/rpc_ds.h
index e06918730a4..dc1aeef464e 100644
--- a/source/include/rpc_ds.h
+++ b/source/include/rpc_ds.h
@@ -64,7 +64,7 @@ typedef struct
 	uint32		dnsname_ptr;
 	uint32		forestname_ptr;
 	
-	struct uuid	domain_guid;
+	GUID		domain_guid;
 	
 	UNISTR2	netbios_domain;
 
@@ -110,7 +110,7 @@ typedef struct {
 	uint32		trust_type;
 	uint32		trust_attributes;
 	uint32		sid_ptr;
-	struct uuid	guid;
+	GUID		guid;
 	
 	UNISTR2		netbios_domain;
 	UNISTR2		dns_domain;
@@ -124,7 +124,7 @@ struct ds_domain_trust {
 	uint32		parent_index;
 	uint32		trust_type;
 	uint32		trust_attributes;
-	struct uuid	guid;
+	GUID		guid;
 	
 	DOM_SID	sid;
 	char *netbios_domain;
diff --git a/source/include/rpc_epmapper.h b/source/include/rpc_epmapper.h
deleted file mode 100644
index bbca6ac1f28..00000000000
--- a/source/include/rpc_epmapper.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   Endpoint mapper data definitions
-   Copyright (C) Jim McDonough (jmcd@us.ibm.com) 2003
-   
-   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 EPM_HANDLE_LEN 20
-
-/* ordinal for the mapping interface */
-
-#define EPM_MAP_PIPE_NAME 0x03
-
-/* some of the different connection protocols and their IDs from Windows */
-
-#define EPM_FLOOR_UUID    0x0d   /* floor contains UUID                   */
-#define EPM_FLOOR_RPC     0x0b   /* tower is for connection-oriented rpc  */
-#define EPM_FLOOR_TCP     0x07   /* floor contains tcp port number        */
-#define EPM_FLOOR_IP      0x09   /* floor contains IP address             */
-#define EPM_FLOOR_NMPIPES 0x0f   /* floor contains remote named pipe name */
-#define EPM_FLOOR_LRPC    0x10   /* floor contains local named pipe name  */
-#define EPM_FLOOR_NETBIOS 0x11   /* floor contains netbios address        */
-#define EPM_FLOOR_NETBEUI 0x12   /* floor contains netbeui address        */
-#define EPM_FLOOR_SOCKET  0x20
-
-#define EPM_PIPE_NM "epmapper"
-
-#define MAX_TOWERS 1
-
-typedef struct
-{
-	uint8 data[EPM_HANDLE_LEN];
-} EPM_HANDLE;
-
-typedef struct 
-{
-	struct {
-		uint16 length;
-		uint8 protocol;
-		struct {
-			struct uuid uuid;
-			uint16 version;
-		} uuid;
-	} lhs;
-	struct {
-		uint16 length;
-		uint16 unknown;
-		struct {
-			uint16 port;
-		} tcp;
-		struct {
-			uint8 addr[4];
-		} ip;
-		char string[MAXHOSTNAMELEN+3]; /* hostname + \\ + null term */
-	} rhs;
-} EPM_FLOOR;
-
-typedef struct
-{
-	uint32 max_length;
-	uint32 length;
-	uint16 num_floors;
-	EPM_FLOOR *floors;
-	uint8 unknown;
-} EPM_TOWER;
-
-typedef struct
-{
-	EPM_HANDLE handle;
-	uint32 tower_ref_id;
-	EPM_TOWER *tower;
-	EPM_HANDLE term_handle; /* in/out */       
-	uint32 max_towers;  
-} EPM_Q_MAP;
-
-typedef struct
-{
-	uint32 max_count;
-	uint32 offset;
-	uint32 count;
-	uint32 *tower_ref_ids;
-	EPM_TOWER *towers;
-} EPM_TOWER_ARRAY;
-
-typedef struct
-{
-	EPM_HANDLE handle;
-	uint32 num_results;
-	EPM_TOWER_ARRAY *results;
-	uint32 status;
-} EPM_R_MAP;
-
-
-/* port mapping entries to be read */
-
-typedef struct _mapper_entries{
-	uint8 protocol        ;
- 	RPC_IFACE uuid_info   ;  /* needs to be zeroed if no specific uuid */
-	uint16 port           ; 
-	char pipe_name[40]    ;
-	char srv_name[20]     ;  
-	uint8 srv_port[4]     ;
-	char func_name[16][16];  /* array of up to 16 functions available */
-} mapper_entries;
-
diff --git a/source/include/rpc_lsa.h b/source/include/rpc_lsa.h
index 29a9cd7306b..2064a38056e 100644
--- a/source/include/rpc_lsa.h
+++ b/source/include/rpc_lsa.h
@@ -275,7 +275,7 @@ typedef struct lsa_dns_dom_info
 	UNIHDR  hdr_dns_dom_name;
 	UNIHDR  hdr_forest_name;
 
-	struct uuid dom_guid; /* domain GUID */
+	GUID       dom_guid; /* domain GUID */
 
 	UNISTR2 uni_nb_dom_name;
 	UNISTR2 uni_dns_dom_name;
@@ -635,20 +635,6 @@ typedef struct lsa_r_unk_get_connuser
 } LSA_R_UNK_GET_CONNUSER;
 
 
-typedef struct lsa_q_createaccount
-{
-	POLICY_HND pol; /* policy handle */
-	DOM_SID2 sid;
-	uint32 access; /* access */
-} LSA_Q_CREATEACCOUNT;
-
-typedef struct lsa_r_createaccount
-{
-	POLICY_HND pol; /* policy handle */
-	NTSTATUS status;
-} LSA_R_CREATEACCOUNT;
-
-
 typedef struct lsa_q_openaccount
 {
 	POLICY_HND pol; /* policy handle */
diff --git a/source/include/rpc_secdes.h b/source/include/rpc_secdes.h
index 56145ac024c..5e718f8167d 100644
--- a/source/include/rpc_secdes.h
+++ b/source/include/rpc_secdes.h
@@ -113,6 +113,13 @@
 					PROTECTED_SACL_SECURITY_INFORMATION|\
 					PROTECTED_DACL_SECURITY_INFORMATION)
 
+/* Globally Unique ID */
+#define  GUID_SIZE 16
+typedef struct guid_info
+{
+	uint8 info[GUID_SIZE];
+} GUID;
+
 /* SEC_ACCESS */
 typedef struct security_info_info
 {
@@ -131,8 +138,8 @@ typedef struct security_ace_info
 
 	/* this stuff may be present when type is XXXX_TYPE_XXXX_OBJECT */
 	uint32  obj_flags; /* xxxx_ACE_OBJECT_xxxx e.g present/inherited present etc */
-	struct uuid obj_guid;  /* object GUID */
-	struct uuid inh_guid;  /* inherited object GUID */		
+	GUID    obj_guid;  /* object GUID */
+	GUID    inh_guid;  /* inherited object GUID */		
         /* eof object stuff */
 
 	DOM_SID trustee;
diff --git a/source/include/secrets.h b/source/include/secrets.h
index 8c393940586..cb4fbd043a7 100644
--- a/source/include/secrets.h
+++ b/source/include/secrets.h
@@ -49,13 +49,6 @@
 #define SECRETS_AUTH_DOMAIN      "SECRETS/AUTH_DOMAIN"
 #define SECRETS_AUTH_PASSWORD  "SECRETS/AUTH_PASSWORD"
 
-/* Trust password type flags */
-#define PASS_MACHINE_TRUST_NT       0x0001
-#define PASS_SERVER_TRUST_NT        0x0002
-#define PASS_DOMAIN_TRUST_NT        0x0004
-#define PASS_MACHINE_TRUST_ADS      0x0008
-#define PASS_DOMAIN_TRUST_ADS       0x0010
-
 /* structure for storing machine account password
    (ie. when samba server is member of a domain */
 struct machine_acct_pass {
diff --git a/source/include/smb.h b/source/include/smb.h
index 6de50c8afa1..3ee6f01d34d 100644
--- a/source/include/smb.h
+++ b/source/include/smb.h
@@ -195,7 +195,6 @@ typedef smb_ucs2_t wfstring[FSTRING_LEN];
 #define PIPE_NETDFS   "\\PIPE\\netdfs"
 #define PIPE_ECHO     "\\PIPE\\rpcecho"
 #define PIPE_SHUTDOWN "\\PIPE\\initshutdown"
-#define PIPE_EPM      "\\PIPE\\epmapper"
 
 #define PIPE_NETLOGON_PLAIN "\\NETLOGON"
 
@@ -210,8 +209,7 @@ typedef smb_ucs2_t wfstring[FSTRING_LEN];
 #define PI_NETDFS		8
 #define PI_ECHO 		9
 #define PI_SHUTDOWN		10
-#define PI_EPM			11
-#define PI_MAX_PIPES		12
+#define PI_MAX_PIPES		11
 
 /* 64 bit time (100usec) since ????? - cifs6.txt, section 3.5, page 30 */
 typedef struct nttime_info
@@ -500,7 +498,6 @@ typedef struct connection_struct
 	int ngroups;
 	gid_t *groups;
 	NT_USER_TOKEN *nt_user_token;
-	PRIVILEGE_SET *privs;
 	
 	time_t lastused;
 	BOOL used;
@@ -520,7 +517,6 @@ struct current_user
 	int ngroups;
 	gid_t *groups;
 	NT_USER_TOKEN *nt_user_token;
-	PRIVILEGE_SET *privs;
 };
 
 /* Defines for the sent_oplock_break field above. */
@@ -1558,7 +1554,6 @@ typedef struct user_struct
 	gid_t *groups;
 
 	NT_USER_TOKEN *nt_user_token;
-	PRIVILEGE_SET *privs;
 
 	DATA_BLOB session_key;
 
@@ -1654,7 +1649,7 @@ struct ip_service {
 
 typedef struct smb_sign_info {
 	void (*sign_outgoing_message)(char *outbuf, struct smb_sign_info *si);
-	BOOL (*check_incoming_message)(char *inbuf, struct smb_sign_info *si, BOOL expected_ok);
+	BOOL (*check_incoming_message)(char *inbuf, struct smb_sign_info *si, BOOL must_be_ok);
 	void (*free_signing_context)(struct smb_sign_info *si);
 	void *signing_context;
 
diff --git a/source/include/smbldap.h b/source/include/smbldap.h
index 119479f218d..68a2c00afe0 100644
--- a/source/include/smbldap.h
+++ b/source/include/smbldap.h
@@ -38,7 +38,6 @@
 #define LDAP_OBJ_IDPOOL			"sambaUnixIdPool"
 #define LDAP_OBJ_IDMAP_ENTRY		"sambaIdmapEntry"
 #define LDAP_OBJ_SID_ENTRY		"sambaSidEntry"
-#define LDAP_OBJ_PRIVILEGE		"sambaPrivilege"
 
 #define LDAP_OBJ_ACCOUNT		"account"
 #define LDAP_OBJ_POSIXACCOUNT		"posixAccount"
@@ -50,7 +49,6 @@
 #define LDAP_ATTRIBUTE_SID		"sambaSID"
 #define LDAP_ATTRIBUTE_UIDNUMBER	"uidNumber"
 #define LDAP_ATTRIBUTE_GIDNUMBER	"gidNumber"
-#define LDAP_ATTRIBUTE_SID_LIST		"sambaSIDList"
 
 /* attribute map table indexes */
 
@@ -95,7 +93,6 @@
 #define LDAP_ATTR_MUNGED_DIAL		37
 #define LDAP_ATTR_BAD_PASSWORD_TIME	38
 #define LDAP_ATTR_MOD_TIMESTAMP		39
-#define LDAP_ATTR_SID_LIST		40
 
 typedef struct _attrib_map_entry {
 	int		attrib;
@@ -109,7 +106,6 @@ extern ATTRIB_MAP_ENTRY attrib_map_v22[];
 extern ATTRIB_MAP_ENTRY attrib_map_v30[];
 extern ATTRIB_MAP_ENTRY dominfo_attr_list[];
 extern ATTRIB_MAP_ENTRY groupmap_attr_list[];
-extern ATTRIB_MAP_ENTRY privilege_attr_list[];
 extern ATTRIB_MAP_ENTRY groupmap_attr_list_to_delete[];
 extern ATTRIB_MAP_ENTRY idpool_attr_list[];
 extern ATTRIB_MAP_ENTRY sidmap_attr_list[];
diff --git a/source/include/tdbsam2_parse_info.h b/source/include/tdbsam2_parse_info.h
deleted file mode 100644
index 35eeaeb2d2c..00000000000
--- a/source/include/tdbsam2_parse_info.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* This is an automatically generated file - DO NOT EDIT! */
-