4 files changed, 0 insertions, 165 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h
index bc3d948a2c..1037d54c4e 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -694,8 +694,6 @@ extern int errno;
 #include "charset.h"
 #include "dynconfig.h"
 
-#include "util_getent.h"
-
 #include "version.h"
 #include "smb.h"
 #include "ads.h"
@@ -704,8 +702,6 @@ extern int errno;
 
 #include "byteorder.h"
 
-#include "msdfs.h"
-
 #include "md5.h"
 #include "hmacmd5.h"
 
@@ -721,8 +717,6 @@ extern int errno;
 
 #include "popt.h"
 
-#include "mangle.h"
-
 #include "mutex.h"
 
 #include "librpc/rpc/dcerpc.h"
@@ -733,13 +727,6 @@ extern int errno;
 #include "cli_context.h"
 #include "registry.h"
 
-
-/* used in net.c */
-struct functable {
-	const char *funcname;
-	int (*fn)(int argc, const char **argv);
-};
-
 #define malloc_p(type) (type *)malloc(sizeof(type))
 #define malloc_array_p(type, count) (type *)realloc_array(NULL, sizeof(type), count)
 #define realloc_p(p, type, count) (type *)realloc_array(p, sizeof(type), count)
diff --git a/source4/include/mangle.h b/source4/include/mangle.h
deleted file mode 100644
index 769278d828..0000000000
--- a/source4/include/mangle.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef _MANGLE_H_
-#define _MANGLE_H_
-/*
-  header for 8.3 name mangling interface 
-*/
-
-struct mangle_fns {
-	BOOL (*is_mangled)(const char *s);
-	BOOL (*is_8_3)(const char *fname, BOOL check_case, BOOL allow_wildcards);
-	void (*reset)(void);
-	BOOL (*check_cache)(char *s);
-	void (*name_map)(char *OutName, BOOL need83, BOOL cache83);
-};
-#endif /* _MANGLE_H_ */
diff --git a/source4/include/msdfs.h b/source4/include/msdfs.h
deleted file mode 100644
index 1bfff9ad53..0000000000
--- a/source4/include/msdfs.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* 
-   Unix SMB/Netbios implementation.
-   Version 3.0
-   MSDfs services for Samba
-   Copyright (C) Shirish Kalele 2000
-
-   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 _MSDFS_H
-#define _MSDFS_H
-
-#define REFERRAL_TTL 600
-
-/* Flags used in trans2 Get Referral reply */
-#define DFSREF_REFERRAL_SERVER 0x1
-#define DFSREF_STORAGE_SERVER  0x2
-
-/* Referral sizes */
-#define VERSION2_REFERRAL_SIZE 0x16
-#define VERSION3_REFERRAL_SIZE 0x22
-#define REFERRAL_HEADER_SIZE 0x08
-
-/* Maximum number of referrals for each Dfs volume */
-#define MAX_REFERRAL_COUNT   256
-
-struct referral
-{
-	pstring alternate_path; /* contains the path referred */
-	uint32 proximity;
-	uint32 ttl; /* how long should client cache referral */
-};
-
-struct junction_map
-{
-  pstring service_name;
-  pstring volume_name;
-  int referral_count;
-  struct referral* referral_list;
-};
-
-struct dfs_path
-{
-	pstring hostname;
-	pstring servicename;
-	pstring reqpath;
-};
-
-#define RESOLVE_DFSPATH(name, conn, inbuf, outbuf)           	\
-{ if ((SVAL(inbuf,smb_flg2) & FLAGS2_DFS_PATHNAMES) &&       	\
-      lp_host_msdfs() && lp_msdfs_root(SNUM(conn)) &&		\
-      dfs_redirect(name,conn,False))				\
-             return ERROR_BOTH(NT_STATUS_PATH_NOT_COVERED,	\
-			       ERRSRV, ERRbadpath);; }	
-			       	
-#define RESOLVE_FINDFIRST_DFSPATH(name, conn, inbuf, outbuf) 		\
-{ if ( (SVAL(inbuf,smb_flg2) & FLAGS2_DFS_PATHNAMES) ||      		\
-       ((get_remote_arch() == RA_WIN95) && lp_msdfs_root(SNUM(conn))) )	\
-	 if (lp_host_msdfs() && dfs_redirect(name,conn,True))       	\
-	         return	ERROR_BOTH(NT_STATUS_PATH_NOT_COVERED,		\
-				   ERRSRV, ERRbadpath);; }          
-
- 
-#endif /* _MSDFS_H */
diff --git a/source4/include/util_getent.h b/source4/include/util_getent.h
deleted file mode 100644
index b67758ba23..0000000000
--- a/source4/include/util_getent.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-   Samba utility functions
-   Copyright (C) Simo Sorce 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.
-*/
-
-#ifndef _UTIL_GETENT_H
-#define _UTIL_GETENT_H
-
-/* Element for a single linked list of group entries */
-/* Replace the use of struct group in some cases */
-/* Used by getgrent_list() */
-
-struct sys_grent {
-	char *gr_name;
-	char *gr_passwd;
-	gid_t gr_gid;
-	char **gr_mem;
-	struct sys_grent *next;
-};
-
-/* Element for a single linked list of passwd entries */
-/* Replace the use of struct passwd in some cases */
-/* Used by getpwent_list() */
-
-struct sys_pwent {
-	char *pw_name;
-	char *pw_passwd;
-	uid_t pw_uid;
-	gid_t pw_gid;
-	char *pw_gecos;
-	char *pw_dir;
-	char *pw_shell;
-	struct sys_pwent *next;
-};
-
-/* Element for a single linked list of user names in a group. */
-/* Used to return group lists that may span multiple lines in 
-   /etc/group file. */
-/* Used by get_users_in_group() */
-
-struct sys_userlist {
-	struct sys_userlist *next, *prev;
-	char *unix_name;
-};
-
-#endif /* _UTIL_GETENT_H */