r718: removed some more unused code, and two source files

(This used to be commit a9768c25fd32e76514c837f343f2b52bf0f0824d)

6 files changed, 1 insertions, 116 deletions

diff --git a/source4/configure.in b/source4/configure.in
index eb1fd7de10..9edb3ed796 100644
--- a/source4/configure.in
+++ b/source4/configure.in
@@ -254,8 +254,7 @@ SMB_BINARY(smbclient, [ALL], [BIN],
 	[LIBSMB CONFIG LIBBASIC LIBCMDLINE])
 
 SMB_BINARY(ndrdump, [ALL], [BIN],
-	[utils/ndrdump.o
-	utils/rewrite.o],
+	[utils/ndrdump.o],
 	[],
 	[LIBSMB CONFIG LIBBASIC LIBCMDLINE])
 
diff --git a/source4/libcli/config.m4 b/source4/libcli/config.m4
index e24fd1ba9e..82f629b280 100644
--- a/source4/libcli/config.m4
+++ b/source4/libcli/config.m4
@@ -35,7 +35,6 @@ SMB_SUBSYSTEM(LIBCLI_UTILS,[],
 		libcli/util/smberr.o 
 		libcli/util/doserr.o 
 		libcli/util/errormap.o 
-		libcli/util/pwd_cache.o 
 		libcli/util/clierror.o 
 		libcli/util/cliutil.o 
 		libcli/util/nterr.o 
diff --git a/source4/libcli/util/pwd_cache.c b/source4/libcli/util/pwd_cache.c
deleted file mode 100644
index 0d84f04ee3..0000000000
--- a/source4/libcli/util/pwd_cache.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   Password cacheing.  obfuscation is planned
-   Copyright (C) Luke Kenneth Casson Leighton 1996-1998
-   
-   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.
-*/
-
-#include "includes.h"
-
-/****************************************************************************
- Initialises a password structure.
-****************************************************************************/
-
-static void pwd_init(struct pwd_info *pwd)
-{
-	memset((char *)pwd->password  , '\0', sizeof(pwd->password  ));
-	memset((char *)pwd->smb_lm_pwd, '\0', sizeof(pwd->smb_lm_pwd));
-	memset((char *)pwd->smb_nt_pwd, '\0', sizeof(pwd->smb_nt_pwd));
-	memset((char *)pwd->smb_lm_owf, '\0', sizeof(pwd->smb_lm_owf));
-	memset((char *)pwd->smb_nt_owf, '\0', sizeof(pwd->smb_nt_owf));
-
-	pwd->null_pwd  = True; /* safest option... */
-	pwd->cleartext = False;
-	pwd->crypted   = False;
-}
-
-/****************************************************************************
- Makes lm and nt hashed passwords.
-****************************************************************************/
-
-static void pwd_make_lm_nt_16(struct pwd_info *pwd, const char *clr)
-{
-	pstring dos_passwd;
-
-	pwd_init(pwd);
-
-	push_ascii_pstring(dos_passwd, clr);
-
-	nt_lm_owf_gen(dos_passwd, pwd->smb_nt_pwd, pwd->smb_lm_pwd);
-	pwd->null_pwd  = False;
-	pwd->cleartext = False;
-	pwd->crypted = False;
-}
-
-/****************************************************************************
- Stores a cleartext password.
-****************************************************************************/
-
-void pwd_set_cleartext(struct pwd_info *pwd, const char *clr)
-{
-	pwd_init(pwd);
-	push_ascii_fstring(pwd->password, clr);
-	pwd->cleartext = True;
-	pwd->null_pwd  = False;
-	pwd->crypted   = False;
-	pwd_make_lm_nt_16(pwd, clr);
-}
-
-
diff --git a/source4/smbd/process.c b/source4/smbd/process.c
index 0e486d7849..7094364bde 100644
--- a/source4/smbd/process.c
+++ b/source4/smbd/process.c
@@ -37,9 +37,6 @@ void smbd_process_init(void)
 	}
 	namecache_enable();
 
-	if (!locking_init(0))
-		exit(1);
-
 	if (!share_info_db_init())
 		exit(1);
 
diff --git a/source4/smbd/rewrite.c b/source4/smbd/rewrite.c
index e5e9340a72..e959fd049d 100644
--- a/source4/smbd/rewrite.c
+++ b/source4/smbd/rewrite.c
@@ -44,9 +44,6 @@ void unbecome_root(void)
 BOOL namecache_enable(void)
 { return True; }
 
-BOOL locking_init(int read_only)
-{ return True; }
-
 BOOL share_info_db_init(void)
 { return True; }
 
@@ -59,6 +56,3 @@ BOOL share_access_check(struct request_context *req, struct tcon_context *conn,
 BOOL init_names(void)
 { return True; }
 
-BOOL become_user_permanently(uid_t uid, gid_t gid)
-{ return True; }
-
diff --git a/source4/utils/rewrite.c b/source4/utils/rewrite.c
deleted file mode 100644
index 789551081d..0000000000
--- a/source4/utils/rewrite.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "includes.h"
-
-/*
-
- this is a set of temporary stub functions used during the samba4 rewrite.
- This file will need to go away before the rewrite is complete.
-*/
-
-BOOL become_user_permanently(uid_t uid, gid_t gid)
-{ return True; }
-
-BOOL is_setuid_root(void)
-{ return False; }
-
- int share_mode_forall(SHAREMODE_FN(fn))
-{ return 0; }
-
-#define BRLOCK_FN(fn) \
-	void (*fn)(SMB_DEV_T dev, SMB_INO_T ino, int pid, \
-				 enum brl_type lock_type, \
-				 br_off start, br_off size)
- int brl_forall(BRLOCK_FN(fn))
-{ return 0; }
-
-BOOL locking_end(void)
-{ return True; }
-
-BOOL locking_init(int read_only)
-{ return True; }
-
-uid_t sec_initial_gid(void)
-{ return 0; }