Remove smbmount.

Karolin
(This used to be commit 5fbd98f7065268ae134108310119078ad8f62322)

9 files changed, 4 insertions, 1643 deletions

diff --git a/source3/Makefile.in b/source3/Makefile.in
index e0068ba5cb..d20cea2d16 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -208,7 +208,7 @@ TORTURE_PROGS = bin/smbtorture@EXEEXT@ bin/msgtest@EXEEXT@ \
 	bin/pdbtest@EXEEXT@ bin/talloctort@EXEEXT@ bin/replacetort@EXEEXT@ \
 	bin/tdbtorture@EXEEXT@
 
-BIN_PROGS = @EXTRA_BIN_PROGS@ @SMBMOUNT_PROGS@ \
+BIN_PROGS = @EXTRA_BIN_PROGS@ \
 	$(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3) $(BIN_PROGS4) 
 
 EVERYTHING_PROGS = bin/debug2html@EXEEXT@ bin/smbfilter@EXEEXT@ \
@@ -831,14 +831,6 @@ NET_OBJ = $(NET_OBJ1) $(PARAM_WITHOUT_REG_OBJ) $(SECRETS_OBJ) $(LIBSMB_OBJ) \
 CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
 	  $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(SECRETS_OBJ) $(POPT_LIB_OBJ)
 
-MOUNT_OBJ = client/smbmount.o \
-             $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(SECRETS_OBJ)
-
-MNT_OBJ = client/smbmnt.o $(VERSION_OBJ) $(LIBREPLACE_OBJ) $(SOCKET_WRAPPER_OBJ)
-
-UMOUNT_OBJ = client/smbumount.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
-	     $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(SECRETS_OBJ)
-
 CIFS_MOUNT_OBJ = client/mount.cifs.o
 
 CIFS_UMOUNT_OBJ = client/umount.cifs.o
@@ -1294,18 +1286,6 @@ bin/smbspool@EXEEXT@: $(BINARY_PREREQS) $(CUPS_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@
 	@echo Linking $@
 	@$(CC) $(FLAGS) -o $@ $(CUPS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@
 
-bin/smbmount@EXEEXT@: $(BINARY_PREREQS) $(MOUNT_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@
-	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(MOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@
-
-bin/smbmnt@EXEEXT@: $(BINARY_PREREQS) $(MNT_OBJ) @BUILD_POPT@
-	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(MNT_OBJ) $(DYNEXP) $(LDFLAGS) @POPTLIBS@
-
-bin/smbumount@EXEEXT@: $(BINARY_PREREQS) $(UMOUNT_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@
-	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@
-
 bin/mount.cifs@EXEEXT@: $(BINARY_PREREQS) $(CIFS_MOUNT_OBJ) @BUILD_POPT@
 	@echo Linking $@
 	@$(CC) $(FLAGS) -o $@ $(CIFS_MOUNT_OBJ) $(DYNEXP) $(LDFLAGS) @POPTLIBS@
@@ -2051,8 +2031,7 @@ revert:
 	@$(SHELL) $(srcdir)/script/revert.sh $(BINDIR) $(BIN_PROGS) $(SCRIPTS)
 
 installman: installdirs
-	@SMBMOUNT_PROGS="@SMBMOUNT_PROGS@" $(SHELL) \
-		$(srcdir)/script/installman.sh $(DESTDIR)$(MANDIR) $(srcdir) C "@ROFF@"
+	@$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(MANDIR) $(srcdir) C "@ROFF@"
 
 .PHONY: showlayout
 
diff --git a/source3/client/smbmnt.c b/source3/client/smbmnt.c
deleted file mode 100644
index 3d7de1b3c0..0000000000
--- a/source3/client/smbmnt.c
+++ /dev/null
@@ -1,332 +0,0 @@
-/*
- *  smbmnt.c
- *
- *  Copyright (C) 1995-1998 by Paal-Kr. Engstad and Volker Lendecke
- *  extensively modified by Tridge
- *
- *  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 3 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, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#define SMBMOUNT_MALLOC 1
-
-#include "includes.h"
-
-#include <mntent.h>
-#include <sys/utsname.h>
-
-#include <asm/types.h>
-#include <asm/posix_types.h>
-#include <linux/smb.h>
-#include <linux/smb_mount.h>
-#include <asm/unistd.h>
-
-#ifndef	MS_MGC_VAL
-/* This may look strange but MS_MGC_VAL is what we are looking for and
-	is what we need from <linux/fs.h> under libc systems and is
-	provided in standard includes on glibc systems.  So...  We
-	switch on what we need...  */
-#include <linux/fs.h>
-#endif
-
-static uid_t mount_uid;
-static gid_t mount_gid;
-static int mount_ro;
-static unsigned mount_fmask;
-static unsigned mount_dmask;
-static int user_mount;
-static char *options;
-
-static void
-help(void)
-{
-        printf("\n");
-        printf("Usage: smbmnt mount-point [options]\n");
-	printf("Version %s\n\n",SAMBA_VERSION_STRING);
-        printf("-s share       share name on server\n"
-               "-r             mount read-only\n"
-               "-u uid         mount as uid\n"
-               "-g gid         mount as gid\n"
-               "-f mask        permission mask for files\n"
-               "-d mask        permission mask for directories\n"
-               "-o options     name=value, list of options\n"
-               "-h             print this help text\n");
-}
-
-static int
-parse_args(int argc, char *argv[], struct smb_mount_data *data, char **share)
-{
-        int opt;
-
-        while ((opt = getopt (argc, argv, "s:u:g:rf:d:o:")) != EOF)
-	{
-                switch (opt)
-		{
-                case 's':
-                        *share = optarg;
-                        break;
-                case 'u':
-			if (!user_mount) {
-				mount_uid = strtol(optarg, NULL, 0);
-			}
-                        break;
-                case 'g':
-			if (!user_mount) {
-				mount_gid = strtol(optarg, NULL, 0);
-			}
-                        break;
-                case 'r':
-                        mount_ro = 1;
-                        break;
-                case 'f':
-                        mount_fmask = strtol(optarg, NULL, 8);
-                        break;
-                case 'd':
-                        mount_dmask = strtol(optarg, NULL, 8);
-                        break;
-		case 'o':
-			options = optarg;
-			break;
-                default:
-                        return -1;
-                }
-        }
-        return 0;
-        
-}
-
-static char *
-fullpath(const char *p)
-{
-        char path[PATH_MAX+1];
-
-	if (strlen(p) > PATH_MAX) {
-		return NULL;
-	}
-
-        if (realpath(p, path) == NULL) {
-		fprintf(stderr,"Failed to find real path for mount point %s: %s\n",
-			p, strerror(errno));
-		exit(1);
-	}
-	return strdup(path);
-}
-
-/* Check whether user is allowed to mount on the specified mount point. If it's
-   OK then we change into that directory - this prevents race conditions */
-static int mount_ok(char *mount_point)
-{
-	struct stat st;
-
-	if (chdir(mount_point) != 0) {
-		return -1;
-	}
-
-        if (stat(".", &st) != 0) {
-		return -1;
-        }
-
-        if (!S_ISDIR(st.st_mode)) {
-                errno = ENOTDIR;
-                return -1;
-        }
-
-        if ((getuid() != 0) && 
-	    ((getuid() != st.st_uid) || 
-	     ((st.st_mode & S_IRWXU) != S_IRWXU))) {
-                errno = EPERM;
-                return -1;
-        }
-
-        return 0;
-}
-
-/* Tries to mount using the appropriate format. For 2.2 the struct,
-   for 2.4 the ascii version. */
-static int
-do_mount(char *share_name, unsigned int flags, struct smb_mount_data *data)
-{
-	char *opts;
-	struct utsname uts;
-	char *release, *major, *minor;
-	char *data1, *data2;
-	int ret;
-	char *saveptr = NULL;
-
-	if (asprintf(&opts,
-			"version=7,uid=%d,gid=%d,file_mode=0%o,dir_mode=0%o,%s",
-			mount_uid, mount_gid, data->file_mode,
-			data->dir_mode,options) < 0) {
-		return -1;
-	}
-
-	uname(&uts);
-	release = uts.release;
-	major = strtok_r(release, ".", &saveptr);
-	minor = strtok_r(NULL, ".", &saveptr);
-	if (major && minor && atoi(major) == 2 && atoi(minor) < 4) {
-		/* < 2.4, assume struct */
-		data1 = (char *) data;
-		data2 = opts;
-	} else {
-		/* >= 2.4, assume ascii but fall back on struct */
-		data1 = opts;
-		data2 = (char *) data;
-	}
-
-	if (mount(share_name, ".", "smbfs", flags, data1) == 0) {
-		SAFE_FREE(opts);
-		return 0;
-	}
-	ret = mount(share_name, ".", "smbfs", flags, data2);
-	SAFE_FREE(opts);
-	return ret;
-}
-
- int main(int argc, char *argv[])
-{
-	char *mount_point, *share_name = NULL;
-	FILE *mtab;
-	int fd;
-	unsigned int flags;
-	struct smb_mount_data data;
-	struct mntent ment;
-
-	memset(&data, 0, sizeof(struct smb_mount_data));
-
-	if (argc < 2) {
-		help();
-		exit(1);
-	}
-
-	if (argv[1][0] == '-') {
-		help();
-		exit(1);
-	}
-
-	if (getuid() != 0) {
-		user_mount = 1;
-	}
-
-        if (geteuid() != 0) {
-                fprintf(stderr, "smbmnt must be installed suid root for direct user mounts (%d,%d)\n", getuid(), geteuid());
-                exit(1);
-        }
-
-	mount_uid = getuid();
-	mount_gid = getgid();
-	mount_fmask = umask(0);
-        umask(mount_fmask);
-	mount_fmask = ~mount_fmask;
-
-        mount_point = fullpath(argv[1]);
-
-        argv += 1;
-        argc -= 1;
-
-        if (mount_ok(mount_point) != 0) {
-                fprintf(stderr, "cannot mount on %s: %s\n",
-                        mount_point, strerror(errno));
-                exit(1);
-        }
-
-	data.version = SMB_MOUNT_VERSION;
-
-        /* getuid() gives us the real uid, who may umount the fs */
-        data.mounted_uid = getuid();
-
-        if (parse_args(argc, argv, &data, &share_name) != 0) {
-                help();
-                return -1;
-        }
-
-        data.uid = mount_uid;    /* truncates to 16-bits here!!! */
-        data.gid = mount_gid;
-        data.file_mode = (S_IRWXU|S_IRWXG|S_IRWXO) & mount_fmask;
-        data.dir_mode  = (S_IRWXU|S_IRWXG|S_IRWXO) & mount_dmask;
-
-        if (mount_dmask == 0) {
-                data.dir_mode = data.file_mode;
-                if ((data.dir_mode & S_IRUSR) != 0)
-                        data.dir_mode |= S_IXUSR;
-                if ((data.dir_mode & S_IRGRP) != 0)
-                        data.dir_mode |= S_IXGRP;
-                if ((data.dir_mode & S_IROTH) != 0)
-                        data.dir_mode |= S_IXOTH;
-        }
-
-	flags = MS_MGC_VAL | MS_NOSUID | MS_NODEV;
-
-	if (mount_ro) flags |= MS_RDONLY;
-
-	if (do_mount(share_name, flags, &data) < 0) {
-		switch (errno) {
-		case ENODEV:
-			fprintf(stderr, "ERROR: smbfs filesystem not supported by the kernel\n");
-			break;
-		default:
-			perror("mount error");
-		}
-		fprintf(stderr, "Please refer to the smbmnt(8) manual page\n");
-		return -1;
-	}
-
-        ment.mnt_fsname = share_name ? share_name : (char *)"none";
-        ment.mnt_dir = mount_point;
-        ment.mnt_type = (char *)"smbfs";
-        ment.mnt_opts = (char *)"";
-        ment.mnt_freq = 0;
-        ment.mnt_passno= 0;
-
-        mount_point = ment.mnt_dir;
-
-	if (mount_point == NULL)
-	{
-		fprintf(stderr, "Mount point too long\n");
-		return -1;
-	}
-	
-        if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1)
-        {
-                fprintf(stderr, "Can't get "MOUNTED"~ lock file");
-                return 1;
-        }
-        close(fd);
-	
-        if ((mtab = setmntent(MOUNTED, "a+")) == NULL)
-        {
-                fprintf(stderr, "Can't open " MOUNTED);
-                return 1;
-        }
-
-        if (addmntent(mtab, &ment) == 1)
-        {
-                fprintf(stderr, "Can't write mount entry");
-                return 1;
-        }
-        if (fchmod(fileno(mtab), 0644) == -1)
-        {
-                fprintf(stderr, "Can't set perms on "MOUNTED);
-                return 1;
-        }
-        endmntent(mtab);
-
-        if (unlink(MOUNTED"~") == -1)
-        {
-                fprintf(stderr, "Can't remove "MOUNTED"~");
-                return 1;
-        }
-
-	return 0;
-}	
diff --git a/source3/client/smbmount.c b/source3/client/smbmount.c
deleted file mode 100644
index ee4b180a89..0000000000
--- a/source3/client/smbmount.c
+++ /dev/null
@@ -1,1047 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   SMBFS mount program
-   Copyright (C) Andrew Tridgell 1999
-   
-   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 3 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, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.h"
-
-#include <mntent.h>
-#include <asm/types.h>
-#include <linux/smb_fs.h>
-
-extern bool in_client;
-extern char *optarg;
-extern int optind;
-
-static char *credentials;
-static fstring my_netbios_name;
-static char *password;
-static char *username;
-static fstring workgroup;
-static char *mpoint;
-static char *service;
-static char *options;
-
-static struct sockaddr_storage dest_ip;
-static bool have_ip;
-static int smb_port = 0;
-static bool got_user;
-static bool got_pass;
-static uid_t mount_uid;
-static gid_t mount_gid;
-static int mount_ro;
-static unsigned mount_fmask;
-static unsigned mount_dmask;
-static bool use_kerberos;
-/* TODO: Add code to detect smbfs version in kernel */
-static bool status32_smbfs = False;
-static bool smbfs_has_unicode = False;
-static bool smbfs_has_lfs = False;
-
-static void usage(void);
-
-static void exit_parent(int sig)
-{
-	/* parent simply exits when child says go... */
-	exit(0);
-}
-
-static void daemonize(void)
-{
-	int j, status;
-	pid_t child_pid;
-
-	signal( SIGTERM, exit_parent );
-
-	if ((child_pid = sys_fork()) < 0) {
-		DEBUG(0,("could not fork\n"));
-	}
-
-	if (child_pid > 0) {
-		while( 1 ) {
-			j = waitpid( child_pid, &status, 0 );
-			if( j < 0 ) {
-				if( EINTR == errno ) {
-					continue;
-				}
-				status = errno;
-			}
-			break;
-		}
-
-		/* If we get here - the child exited with some error status */
-		if (WIFSIGNALED(status))
-			exit(128 + WTERMSIG(status));
-		else
-			exit(WEXITSTATUS(status));
-	}
-
-	signal( SIGTERM, SIG_DFL );
-	chdir("/");
-}
-
-static void close_our_files(int client_fd)
-{
-	int i;
-	struct rlimit limits;
-
-	getrlimit(RLIMIT_NOFILE,&limits);
-	for (i = 0; i< limits.rlim_max; i++) {
-		if (i == client_fd)
-			continue;
-		close(i);
-	}
-}
-
-static void usr1_handler(int x)
-{
-	return;
-}
-
-
-/***************************************************** 
-return a connection to a server
-*******************************************************/
-static struct cli_state *do_connection(char *the_service)
-{
-	struct cli_state *c;
-	struct nmb_name called, calling;
-	char *server_n;
-	struct sockaddr_storage ip;
-	char *server;
-	char *share;
-	const char *c_username;
-	const char *c_password;
-	TALLOC_CTX *ctx = talloc_tos();
-
-	if (the_service[0] != '\\' || the_service[1] != '\\') {
-		usage();
-		exit(1);
-	}
-
-	server = talloc_strdup(ctx, the_service+2);
-	if (!server) {
-		fprintf(stderr,"Out of memory\n");
-		exit(ENOMEM);
-	}
-	share = strchr_m(server,'\\');
-	if (!share) {
-		usage();
-		exit(1);
-	}
-	*share = 0;
-	share++;
-
-	server_n = server;
-
-	make_nmb_name(&calling, my_netbios_name, 0x0);
-	make_nmb_name(&called , server, 0x20);
-
- again:
-        zero_addr(&ip);
-	if (have_ip) ip = dest_ip;
-
-	/* have to open a new connection */
-	if (!(c=cli_initialise()) || (cli_set_port(c, smb_port) != smb_port) ||
-	    !NT_STATUS_IS_OK(cli_connect(c, server_n, &ip))) {
-		DEBUG(0,("%d: Connection to %s failed\n", sys_getpid(), server_n));
-		if (c) {
-			cli_shutdown(c);
-		}
-		return NULL;
-	}
-
-	/* SPNEGO doesn't work till we get NTSTATUS error support */
-	/* But it is REQUIRED for kerberos authentication */
-	if(!use_kerberos) c->use_spnego = False;
-
-	/* The kernel doesn't yet know how to sign it's packets */
-	c->sign_info.allow_smb_signing = False;
-
-	/* Use kerberos authentication if specified */
-	c->use_kerberos = use_kerberos;
-
-	if (!cli_session_request(c, &calling, &called)) {
-		char *p;
-		DEBUG(0,("%d: session request to %s failed (%s)\n", 
-			 sys_getpid(), called.name, cli_errstr(c)));
-		cli_shutdown(c);
-		if ((p=strchr_m(called.name, '.'))) {
-			*p = 0;
-			goto again;
-		}
-		if (strcmp(called.name, "*SMBSERVER")) {
-			make_nmb_name(&called , "*SMBSERVER", 0x20);
-			goto again;
-		}
-		return NULL;
-	}
-
-	DEBUG(4,("%d: session request ok\n", sys_getpid()));
-
-	if (!cli_negprot(c)) {
-		DEBUG(0,("%d: protocol negotiation failed\n", sys_getpid()));
-		cli_shutdown(c);
-		return NULL;
-	}
-
-	if (!got_pass) {
-		char *pass = getpass("Password: ");
-		if (pass) {
-			password = talloc_strdup(talloc_tos(), pass);
-			if (!password) {
-				return NULL;
-			}
-		}
-	}
-
-	/* This should be right for current smbfs. Future versions will support
-	  large files as well as unicode and oplocks. */
-  	c->capabilities &= ~(CAP_NT_SMBS | CAP_NT_FIND | CAP_LEVEL_II_OPLOCKS);
-  	if (!smbfs_has_lfs)
-  		c->capabilities &= ~CAP_LARGE_FILES;
-  	if (!smbfs_has_unicode)
-  		c->capabilities &= ~CAP_UNICODE;
-	if (!status32_smbfs) {
-  		c->capabilities &= ~CAP_STATUS32;
-		c->force_dos_errors = True;
-	}
-
-	c_password = password ? password : "";
-	c_username = username ? username : "";
-
-	if (!NT_STATUS_IS_OK(cli_session_setup(c,
-					c_username,
-					c_password, strlen(c_password),
-					c_password, strlen(c_password),
-					workgroup))) {
-		/* if a password was not supplied then try again with a
-			null username */
-		if (c_password[0] || !c_username[0] ||
-		    !NT_STATUS_IS_OK(cli_session_setup(c, "", "", 0, "", 0, workgroup))) {
-			DEBUG(0,("%d: session setup failed: %s\n",
-				sys_getpid(), cli_errstr(c)));
-			cli_shutdown(c);
-			return NULL;
-		}
-		DEBUG(0,("Anonymous login successful\n"));
-	}
-
-	DEBUG(4,("%d: session setup ok\n", sys_getpid()));
-
-	if (!cli_send_tconX(c, share, "?????",
-			    c_password, strlen(c_password)+1)) {
-		DEBUG(0,("%d: tree connect failed: %s\n",
-			 sys_getpid(), cli_errstr(c)));
-		cli_shutdown(c);
-		return NULL;
-	}
-
-	DEBUG(4,("%d: tconx ok\n", sys_getpid()));
-
-	got_pass = True;
-
-	return c;
-}
-
-/****************************************************************************
-unmount smbfs  (this is a bailout routine to clean up if a reconnect fails)
-	Code blatently stolen from smbumount.c
-		-mhw-
-****************************************************************************/
-static void smb_umount(char *mount_point)
-{
-	int fd;
-        struct mntent *mnt;
-        FILE* mtab;
-        FILE* new_mtab;
-
-	/* Programmers Note:
-		This routine only gets called to the scene of a disaster
-		to shoot the survivors...  A connection that was working
-		has now apparently failed.  We have an active mount point
-		(presumably) that we need to dump.  If we get errors along
-		the way - make some noise, but we are already turning out
-		the lights to exit anyways...
-	*/
-        if (umount(mount_point) != 0) {
-                DEBUG(0,("%d: Could not umount %s: %s\n",
-			 sys_getpid(), mount_point, strerror(errno)));
-                return;
-        }
-
-        if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1) {
-                DEBUG(0,("%d: Can't get "MOUNTED"~ lock file", sys_getpid()));
-                return;
-        }
-
-        close(fd);
-	
-        if ((mtab = setmntent(MOUNTED, "r")) == NULL) {
-                DEBUG(0,("%d: Can't open " MOUNTED ": %s\n",
-			 sys_getpid(), strerror(errno)));
-                return;
-        }
-
-#define MOUNTED_TMP MOUNTED".tmp"
-
-        if ((new_mtab = setmntent(MOUNTED_TMP, "w")) == NULL) {
-                DEBUG(0,("%d: Can't open " MOUNTED_TMP ": %s\n",
-			 sys_getpid(), strerror(errno)));
-                endmntent(mtab);
-                return;
-        }
-
-        while ((mnt = getmntent(mtab)) != NULL) {
-                if (strcmp(mnt->mnt_dir, mount_point) != 0) {
-                        addmntent(new_mtab, mnt);
-                }
-        }
-
-        endmntent(mtab);
-
-        if (fchmod (fileno (new_mtab), S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH) < 0) {
-                DEBUG(0,("%d: Error changing mode of %s: %s\n",
-			 sys_getpid(), MOUNTED_TMP, strerror(errno)));
-                return;
-        }
-
-        endmntent(new_mtab);
-
-        if (rename(MOUNTED_TMP, MOUNTED) < 0) {
-                DEBUG(0,("%d: Cannot rename %s to %s: %s\n",
-			 sys_getpid(), MOUNTED, MOUNTED_TMP, strerror(errno)));
-                return;
-        }
-
-        if (unlink(MOUNTED"~") == -1) {
-                DEBUG(0,("%d: Can't remove "MOUNTED"~", sys_getpid()));
-                return;
-        }
-}
-
-
-/*
- * Call the smbfs ioctl to install a connection socket,
- * then wait for a signal to reconnect. Note that we do
- * not exit after open_sockets() or send_login() errors,
- * as the smbfs mount would then have no way to recover.
- */
-static void send_fs_socket(char *the_service, char *mount_point, struct cli_state *c)
-{
-	int fd, closed = 0, res = 1;
-	pid_t parentpid = getppid();
-	struct smb_conn_opt conn_options;
-
-	memset(&conn_options, 0, sizeof(conn_options));
-
-	while (1) {
-		if ((fd = open(mount_point, O_RDONLY)) < 0) {
-			DEBUG(0,("mount.smbfs[%d]: can't open %s\n",
-				 sys_getpid(), mount_point));
-			break;
-		}
-
-		conn_options.fd = c->fd;
-		conn_options.protocol = c->protocol;
-		conn_options.case_handling = SMB_CASE_DEFAULT;
-		conn_options.max_xmit = c->max_xmit;
-		conn_options.server_uid = c->vuid;
-		conn_options.tid = c->cnum;
-		conn_options.secmode = c->sec_mode;
-		conn_options.rawmode = 0;
-		conn_options.sesskey = c->sesskey;
-		conn_options.maxraw = 0;
-		conn_options.capabilities = c->capabilities;
-		conn_options.serverzone = c->serverzone/60;
-
-		res = ioctl(fd, SMB_IOC_NEWCONN, &conn_options);
-		if (res != 0) {
-			DEBUG(0,("mount.smbfs[%d]: ioctl failed, res=%d\n",
-				 sys_getpid(), res));
-			close(fd);
-			break;
-		}
-
-		if (parentpid) {
-			/* Ok...  We are going to kill the parent.  Now
-				is the time to break the process group... */
-			setsid();
-			/* Send a signal to the parent to terminate */
-			kill(parentpid, SIGTERM);
-			parentpid = 0;
-		}
-
-		close(fd);
-
-		/* This looks wierd but we are only closing the userspace
-		   side, the connection has already been passed to smbfs and 
-		   it has increased the usage count on the socket.
-
-		   If we don't do this we will "leak" sockets and memory on
-		   each reconnection we have to make. */
-		c->smb_rw_error = SMB_DO_NOT_DO_TDIS;
-		cli_shutdown(c);
-		c = NULL;
-
-		if (!closed) {
-			/* close the name cache so that close_our_files() doesn't steal its FD */
-			namecache_shutdown();
-
-			/* redirect stdout & stderr since we can't know that
-			   the library functions we use are using DEBUG. */
-			if ( (fd = open("/dev/null", O_WRONLY)) < 0)
-				DEBUG(2,("mount.smbfs: can't open /dev/null\n"));
-			close_our_files(fd);
-			if (fd >= 0) {
-				dup2(fd, STDOUT_FILENO);
-				dup2(fd, STDERR_FILENO);
-				close(fd);
-			}
-
-			/* here we are no longer interactive */
-			set_remote_machine_name("smbmount", False);	/* sneaky ... */
-			setup_logging("mount.smbfs", False);
-			reopen_logs();
-			DEBUG(0, ("mount.smbfs: entering daemon mode for service %s, pid=%d\n", the_service, sys_getpid()));
-
-			closed = 1;
-		}
-
-		/* Wait for a signal from smbfs ... but don't continue
-                   until we actually get a new connection. */
-		while (!c) {
-			CatchSignal(SIGUSR1, &usr1_handler);
-			pause();
-			DEBUG(2,("mount.smbfs[%d]: got signal, getting new socket\n", sys_getpid()));
-			c = do_connection(the_service);
-		}
-	}
-
-	smb_umount(mount_point);
-	DEBUG(2,("mount.smbfs[%d]: exit\n", sys_getpid()));
-	exit(1);
-}
-
-
-/**
- * Mount a smbfs
- **/
-
-#define NUM_ARGS 20
-
-static void init_mount(void)
-{
-	char mount_point[PATH_MAX+1];
-	TALLOC_CTX *ctx = talloc_tos();
-	char *svc2;
-	struct cli_state *c;
-	const char *args[NUM_ARGS];
-	int i, status;
-
-	if (realpath(mpoint, mount_point) == NULL) {
-		fprintf(stderr, "Could not resolve mount point %s\n", mpoint);
-		return;
-	}
-
-
-	c = do_connection(service);
-	if (!c) {
-		fprintf(stderr,"SMB connection failed\n");
-		exit(1);
-	}
-
-	/*
-		Set up to return as a daemon child and wait in the parent
-		until the child say it's ready...
-	*/
-	daemonize();
-
-	svc2 = talloc_strdup(ctx, service);
-	if (!svc2) {
-		fprintf(stderr, "Out of memory.\n");
-		exit(ENOMEM);
-	}
-	string_replace(svc2, '\\','/');
-	string_replace(svc2, ' ','_');
-
-	memset(args, 0, sizeof(args[0])*NUM_ARGS);
-
-	i=0;
-	args[i++] = "smbmnt";
-
-	args[i++] = mount_point;
-	args[i++] = "-s";
-	args[i++] = svc2;
-
-	if (mount_ro && i < NUM_ARGS-2) {
-		args[i++] = "-r";
-	}
-	if (mount_uid && i < NUM_ARGS-3) {
-		args[i++] = "-u";
-		args[i] = talloc_asprintf(ctx, "%d", mount_uid);
-		if (!args[i]) {
-			fprintf(stderr, "Out of memory.\n");
-			exit(ENOMEM);
-		}
-		i++;
-	}
-	if (mount_gid && i < NUM_ARGS-3) {
-		args[i++] = "-g";
-		args[i] = talloc_asprintf(ctx, "%d", mount_gid);
-		if (!args[i]) {
-			fprintf(stderr, "Out of memory.\n");
-			exit(ENOMEM);
-		}
-		i++;
-	}
-	if (mount_fmask && i < NUM_ARGS-3) {
-		args[i++] = "-f";
-		args[i] = talloc_asprintf(ctx, "0%o", mount_fmask);
-		if (!args[i]) {
-			fprintf(stderr, "Out of memory.\n");
-			exit(ENOMEM);
-		}
-		i++;
-	}
-	if (mount_dmask && i < NUM_ARGS-3) {
-		args[i++] = "-d";
-		args[i] = talloc_asprintf(ctx, "0%o", mount_dmask);
-		if (!args[i]) {
-			fprintf(stderr, "Out of memory.\n");
-			exit(ENOMEM);
-		}
-		i++;
-	}
-	if (options && i < NUM_ARGS-3) {
-		args[i++] = "-o";
-		args[i++] = options;
-	}
-
-	if (sys_fork() == 0) {
-		char *smbmnt_path;
-
-		asprintf(&smbmnt_path, "%s/smbmnt", get_dyn_BINDIR());
-
-		if (file_exist(smbmnt_path, NULL)) {
-			execv(smbmnt_path, (char * const *)args);
-			fprintf(stderr,
-				"smbfs/init_mount: execv of %s failed. Error was %s.",
-				smbmnt_path, strerror(errno));
-		} else {
-			execvp("smbmnt", (char * const *)args);
-			fprintf(stderr,
-				"smbfs/init_mount: execv of %s failed. Error was %s.",
-				"smbmnt", strerror(errno));
-		}
-		free(smbmnt_path);
-		exit(1);
-	}
-
-	if (waitpid(-1, &status, 0) == -1) {
-		fprintf(stderr,"waitpid failed: Error was %s", strerror(errno) );
-		/* FIXME: do some proper error handling */
-		exit(1);
-	}
-
-	if (WIFEXITED(status) && WEXITSTATUS(status) != 0) {
-		fprintf(stderr,"smbmnt failed: %d\n", WEXITSTATUS(status));
-		/* FIXME: do some proper error handling */
-		exit(1);
-	} else if (WIFSIGNALED(status)) {
-		fprintf(stderr, "smbmnt killed by signal %d\n", WTERMSIG(status));
-		exit(1);
-	}
-
-	/* Ok...  This is the rubicon for that mount point...  At any point
-	   after this, if the connections fail and can not be reconstructed
-	   for any reason, we will have to unmount the mount point.  There
-	   is no exit from the next call...
-	*/
-	send_fs_socket(service, mount_point, c);
-}
-
-
-/****************************************************************************
-get a password from a a file or file descriptor
-exit on failure (from smbclient, move to libsmb or shared .c file?)
-****************************************************************************/
-
-static void get_password_file(void)
-{
-	int fd = -1;
-	char *p;
-	bool close_it = False;
-	char *spec = NULL;
-	TALLOC_CTX *ctx = talloc_tos();
-	char pass[128];
-
-	if ((p = getenv("PASSWD_FD")) != NULL) {
-		spec = talloc_asprintf(ctx,
-				"descriptor %s",
-				p);
-		if (!spec) {
-			fprintf(stderr, "Out of memory.\n");
-			exit(ENOMEM);
-		}
-		fd = atoi(p);
-		close_it = False;
-	} else if ((p = getenv("PASSWD_FILE")) != NULL) {
-		fd = sys_open(p, O_RDONLY, 0);
-		spec = talloc_strdup(ctx, p);
-		if (!spec) {
-			fprintf(stderr, "Out of memory.\n");
-			exit(ENOMEM);
-		}
-		if (fd < 0) {
-			fprintf(stderr, "Error opening PASSWD_FILE %s: %s\n",
-				spec, strerror(errno));
-			exit(1);
-		}
-		close_it = True;
-	}
-
-	for(p = pass, *p = '\0'; /* ensure that pass is null-terminated */
-	    p && p - pass < sizeof(pass);) {
-		switch (read(fd, p, 1)) {
-		case 1:
-			if (*p != '\n' && *p != '\0') {
-				*++p = '\0'; /* advance p, and null-terminate pass */
-				break;
-			}
-		case 0:
-			if (p - pass) {
-				*p = '\0'; /* null-terminate it, just in case... */
-				p = NULL; /* then force the loop condition to become false */
-				break;
-			} else {
-				fprintf(stderr, "Error reading password from file %s: %s\n",
-					spec, "empty password\n");
-				exit(1);
-			}
-
-		default:
-			fprintf(stderr, "Error reading password from file %s: %s\n",
-				spec, strerror(errno));
-			exit(1);
-		}
-	}
-	password = talloc_strdup(ctx, pass);
-	if (close_it)
-		close(fd);
-}
-
-/****************************************************************************
-get username and password from a credentials file
-exit on failure (from smbclient, move to libsmb or shared .c file?)
-****************************************************************************/
-
-static void read_credentials_file(const char *filename)
-{
-	FILE *auth;
-	fstring buf;
-	uint16 len = 0;
-	char *ptr, *val, *param;
-
-	if ((auth=sys_fopen(filename, "r")) == NULL)
-	{
-		/* fail if we can't open the credentials file */
-		DEBUG(0,("ERROR: Unable to open credentials file!\n"));
-		exit (-1);
-	}
-
-	while (!feof(auth))
-	{
-		/* get a line from the file */
-		if (!fgets (buf, sizeof(buf), auth))
-			continue;
-		len = strlen(buf);
-
-		if ((len) && (buf[len-1]=='\n'))
-		{
-			buf[len-1] = '\0';
-			len--;
-		}
-		if (len == 0)
-			continue;
-
-		/* break up the line into parameter & value.
-		   will need to eat a little whitespace possibly */
-		param = buf;
-		if (!(ptr = strchr (buf, '=')))
-			continue;
-		val = ptr+1;
-		*ptr = '\0';
-
-		/* eat leading white space */
-		while ((*val!='\0') && ((*val==' ') || (*val=='\t')))
-			val++;
-
-		if (strwicmp("password", param) == 0)
-		{
-			password = talloc_strdup(talloc_tos(),val);
-			got_pass = True;
-		}
-		else if (strwicmp("username", param) == 0) {
-			username = talloc_strdup(talloc_tos(), val);
-		}
-
-		memset(buf, 0, sizeof(buf));
-	}
-	fclose(auth);
-}
-
-
-/****************************************************************************
-usage on the program
-****************************************************************************/
-static void usage(void)
-{
-	printf("Usage: mount.smbfs service mountpoint [-o options,...]\n");
-
-	printf("Version %s\n\n",SAMBA_VERSION_STRING);
-
-	printf("Please be aware that smbfs is deprecated in favor of "
-	       "cifs\n\n");
-
-	printf(
-"Options:\n\
-      username=<arg>                  SMB username\n\
-      password=<arg>                  SMB password\n\
-      credentials=<filename>          file with username/password\n\
-      krb                             use kerberos (active directory)\n\
-      netbiosname=<arg>               source NetBIOS name\n\
-      uid=<arg>                       mount uid or username\n\
-      gid=<arg>                       mount gid or groupname\n\
-      port=<arg>                      remote SMB port number\n\
-      fmask=<arg>                     file umask\n\
-      dmask=<arg>                     directory umask\n\
-      debug=<arg>                     debug level\n\
-      ip=<arg>                        destination host or IP address\n\
-      workgroup=<arg>                 workgroup on destination\n\
-      sockopt=<arg>                   TCP socket options\n\
-      scope=<arg>                     NetBIOS scope\n\
-      iocharset=<arg>                 Linux charset (iso8859-1, utf8)\n\
-      codepage=<arg>                  server codepage (cp850)\n\
-      unicode                         use unicode when communicating with server\n\
-      lfs                             large file system support\n\
-      ttl=<arg>                       dircache time to live\n\
-      guest                           don't prompt for a password\n\
-      ro                              mount read-only\n\
-      rw                              mount read-write\n\
-\n\
-This command is designed to be run from within /bin/mount by giving\n\
-the option '-t smbfs'. For example:\n\
-  mount -t smbfs -o username=tridge,password=foobar //fjall/test /data/test\n\
-");
-}
-
-
-/****************************************************************************
-  Argument parsing for mount.smbfs interface
-  mount will call us like this:
-    mount.smbfs device mountpoint -o <options>
-  
-  <options> is never empty, containing at least rw or ro
- ****************************************************************************/
-static void parse_mount_smb(int argc, char **argv)
-{
-	int opt;
-	char *opts;
-	char *opteq;
-	int val;
-	char *saveptr = NULL;
-	TALLOC_CTX *ctx = talloc_tos();
-
-	/* FIXME: This function can silently fail if the arguments are
-	 * not in the expected order.
-
-	> The arguments syntax of smbmount 2.2.3a (smbfs of Debian stable)
-	> requires that one gives "-o" before further options like username=...
-	> . Without -o, the username=.. setting is *silently* ignored. I've
-	> spent about an hour trying to find out why I couldn't log in now..
-
-	*/
-
-
-	if (argc < 2 || argv[1][0] == '-') {
-		usage();
-		exit(1);
-	}
-
-	service = talloc_strdup(ctx, argv[1]);
-	if (!service) {
-		fprintf(stderr,"Out of memory\n");
-		exit(ENOMEM);
-	}
-	mpoint = talloc_strdup(ctx, argv[2]);
-	if (!mpoint) {
-		fprintf(stderr,"Out of memory\n");
-		exit(ENOMEM);
-	}
-
-	/* Convert any '/' characters in the service name to
-	   '\' characters */
-	string_replace(service, '/','\\');
-	argc -= 2;
-	argv += 2;
-
-	opt = getopt(argc, argv, "o:");
-	if(opt != 'o') {
-		return;
-	}
-
-	options = talloc_strdup(ctx, "");
-	if (!options) {
-		fprintf(stderr,"Out of memory\n");
-		exit(ENOMEM);
-	}
-
-	/*
-	 * option parsing from nfsmount.c (util-linux-2.9u)
-	 */
-        for (opts = strtok_r(optarg, ",", &saveptr); opts;
-	     opts = strtok_r(NULL, ",", &saveptr)) {
-		DEBUG(3, ("opts: %s\n", opts));
-                if ((opteq = strchr_m(opts, '='))) {
-                        val = atoi(opteq + 1);
-                        *opteq = '\0';
-
-                        if (!strcmp(opts, "username") ||
-			    !strcmp(opts, "logon")) {
-				char *lp;
-				got_user = True;
-				username = talloc_strdup(ctx, opteq+1);
-				if (!username) {
-					fprintf(stderr,"Out of memory\n");
-					exit(ENOMEM);
-				}
-				if ((lp=strchr_m(username,'%'))) {
-					*lp = 0;
-					password = talloc_strdup(ctx, lp+1);
-					if (!password) {
-						fprintf(stderr,"Out of memory\n");
-						exit(ENOMEM);
-					}
-					got_pass = True;
-					memset(strchr_m(opteq+1,'%')+1,'X',strlen(password));
-				}
-				if ((lp=strchr_m(username,'/'))) {
-					*lp = 0;
-					fstrcpy(workgroup,lp+1);
-				}
-			} else if(!strcmp(opts, "passwd") ||
-				  !strcmp(opts, "password")) {
-				password = talloc_strdup(ctx,opteq+1);
-				if (!password) {
-					fprintf(stderr,"Out of memory\n");
-					exit(ENOMEM);
-				}
-				got_pass = True;
-				memset(opteq+1,'X',strlen(password));
-			} else if(!strcmp(opts, "credentials")) {
-				credentials = talloc_strdup(ctx,opteq+1);
-				if (!credentials) {
-					fprintf(stderr,"Out of memory\n");
-					exit(ENOMEM);
-				}
-			} else if(!strcmp(opts, "netbiosname")) {
-				fstrcpy(my_netbios_name,opteq+1);
-			} else if(!strcmp(opts, "uid")) {
-				mount_uid = nametouid(opteq+1);
-			} else if(!strcmp(opts, "gid")) {
-				mount_gid = nametogid(opteq+1);
-			} else if(!strcmp(opts, "port")) {
-				smb_port = val;
-			} else if(!strcmp(opts, "fmask")) {
-				mount_fmask = strtol(opteq+1, NULL, 8);
-			} else if(!strcmp(opts, "dmask")) {
-				mount_dmask = strtol(opteq+1, NULL, 8);
-			} else if(!strcmp(opts, "debug")) {
-				DEBUGLEVEL = val;
-			} else if(!strcmp(opts, "ip")) {
-				if (!interpret_string_addr(&dest_ip, opteq+1,
-							   0)) {
-					fprintf(stderr,"Can't resolve address %s\n", opteq+1);
-					exit(1);
-				}
-				have_ip = True;
-			} else if(!strcmp(opts, "workgroup")) {
-				fstrcpy(workgroup,opteq+1);
-			} else if(!strcmp(opts, "sockopt")) {
-				lp_do_parameter(-1, "socket options", opteq+1);
-			} else if(!strcmp(opts, "scope")) {
-				set_global_scope(opteq+1);
-			} else {
-				options = talloc_asprintf_append(options,
-							"%s=%s,",
-							opts, opteq+1);
-				if (!options) {
-					fprintf(stderr,"Out of memory\n");
-					exit(ENOMEM);
-				}
-			}
-		} else {
-			val = 1;
-			if(!strcmp(opts, "nocaps")) {
-				fprintf(stderr, "Unhandled option: %s\n", opteq+1);
-				exit(1);
-			} else if(!strcmp(opts, "guest")) {
-				password = talloc_strdup(talloc_tos(), "");
-				if (!password) {
-					fprintf(stderr,"Out of memory\n");
-					exit(ENOMEM);
-				}
-				got_pass = True;
-			} else if(!strcmp(opts, "krb")) {
-#ifdef HAVE_KRB5
-
-				use_kerberos = True;
-				if(!status32_smbfs)
-					fprintf(stderr, "Warning: kerberos support will only work for samba servers\n");
-#else
-				fprintf(stderr,"No kerberos support compiled in\n");
-				exit(1);
-#endif
-			} else if(!strcmp(opts, "rw")) {
-				mount_ro = 0;
-			} else if(!strcmp(opts, "ro")) {
-				mount_ro = 1;
-			} else if(!strcmp(opts, "unicode")) {
-				smbfs_has_unicode = True;
-			} else if(!strcmp(opts, "lfs")) {
-				smbfs_has_lfs = True;
-			} else {
-				options = talloc_asprintf_append(options,
-						"%s,",
-						opts);
-				if (!options) {
-					fprintf(stderr,"Out of memory\n");
-					exit(ENOMEM);
-				}
-			}
-		}
-	}
-
-	if (!service || !*service) {
-		usage();
-		exit(1);
-	}
-
-	if (options && *options && options[strlen(options)-1] == ',') {
-		options[strlen(options)-1] = '\0';	/* remove trailing , */
-		DEBUG(3,("passthrough options '%s'\n", options));
-	}
-}
-
-/****************************************************************************
-  main program
-****************************************************************************/
- int main(int argc,char *argv[])
-{
-	TALLOC_CTX *frame = talloc_stackframe();
-	char *p;
-
-	DEBUGLEVEL = 1;
-
-	load_case_tables();
-
-	/* here we are interactive, even if run from autofs */
-	setup_logging("mount.smbfs",True);
-
-#if 0 /* JRA - Urban says not needed ? */
-	/* CLI_FORCE_ASCII=false makes smbmount negotiate unicode. The default
-	   is to not announce any unicode capabilities as current smbfs does
-	   not support it. */
-	p = getenv("CLI_FORCE_ASCII");
-	if (p && !strcmp(p, "false"))
-		unsetenv("CLI_FORCE_ASCII");
-	else
-		setenv("CLI_FORCE_ASCII", "true", 1);
-#endif
-
-	in_client = True;   /* Make sure that we tell lp_load we are */
-
-	if (getenv("USER")) {
-		username = talloc_strdup(frame, getenv("USER"));
-		if (!username) {
-			exit(ENOMEM);
-		}
-
-		if ((p=strchr_m(username,'%'))) {
-			*p = 0;
-			password = talloc_strdup(frame, p+1);
-			if (!password) {
-				exit(ENOMEM);
-			}
-			got_pass = True;
-			memset(strchr_m(getenv("USER"),'%')+1,'X',strlen(password));
-		}
-		strupper_m(username);
-	}
-
-	if (getenv("PASSWD")) {
-		password = talloc_strdup(frame, getenv("PASSWD"));
-		if (!password) {
-			exit(ENOMEM);
-		}
-		got_pass = True;
-	}
-
-	if (getenv("PASSWD_FD") || getenv("PASSWD_FILE")) {
-		get_password_file();
-		got_pass = True;
-	}
-
-	if ((!username || *username == 0) && getenv("LOGNAME")) {
-		username = talloc_strdup(frame, getenv("LOGNAME"));
-		if (!username) {
-			exit(ENOMEM);
-		}
-	}
-
-	if (!lp_load(get_dyn_CONFIGFILE(),True,False,False,True)) {
-		fprintf(stderr, "Can't load %s - run testparm to debug it\n", 
-			get_dyn_CONFIGFILE());
-	}
-
-	parse_mount_smb(argc, argv);
-
-	if (use_kerberos && !got_user) {
-		got_pass = True;
-	}
-
-	if (credentials && *credentials != 0) {
-		read_credentials_file(credentials);
-	}
-
-	DEBUG(3,("mount.smbfs started (version %s)\n", SAMBA_VERSION_STRING));
-
-	if (*workgroup == 0) {
-		fstrcpy(workgroup,lp_workgroup());
-	}
-
-	load_interfaces();
-	if (!*my_netbios_name) {
-		fstrcpy(my_netbios_name, myhostname());
-	}
-	strupper_m(my_netbios_name);
-
-	init_mount();
-	TALLOC_FREE(frame);
-	return 0;
-}
diff --git a/source3/client/smbumount.c b/source3/client/smbumount.c
deleted file mode 100644
index e74c31299c..0000000000
--- a/source3/client/smbumount.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- *  smbumount.c
- *
- *  Copyright (C) 1995-1998 by Volker Lendecke
- *
- */
-
-#define SMBMOUNT_MALLOC 1
-
-#include "includes.h"
-
-#include <mntent.h>
-
-#include <asm/types.h>
-#include <asm/posix_types.h>
-#include <linux/smb.h>
-#include <linux/smb_mount.h>
-#include <linux/smb_fs.h>
-
-/* This is a (hopefully) temporary hack due to the fact that
-	sizeof( uid_t ) != sizeof( __kernel_uid_t ) under glibc.
-	This may change in the future and smb.h may get fixed in the
-	future.  In the mean time, it's ugly hack time - get over it.
-*/
-#undef SMB_IOC_GETMOUNTUID
-#define	SMB_IOC_GETMOUNTUID		_IOR('u', 1, __kernel_uid_t)
-
-#ifndef O_NOFOLLOW
-#define O_NOFOLLOW     0400000
-#endif
-
-static void
-usage(void)
-{
-        printf("usage: smbumount mountpoint\n\n");
-	printf("Please be aware that smbfs is deprecated in favor of "
-	       "cifs\n");
-}
-
-static int
-umount_ok(const char *mount_point)
-{
-	/* we set O_NOFOLLOW to prevent users playing games with symlinks to
-	   umount filesystems they don't own */
-        int fid = open(mount_point, O_RDONLY|O_NOFOLLOW, 0);
-        __kernel_uid32_t mount_uid;
-
-        if (fid == -1) {
-                fprintf(stderr, "Could not open %s: %s\n",
-                        mount_point, strerror(errno));
-                return -1;
-        }
-
-        if (ioctl(fid, SMB_IOC_GETMOUNTUID32, &mount_uid) != 0) {
-                __kernel_uid_t mount_uid16;
-                if (ioctl(fid, SMB_IOC_GETMOUNTUID, &mount_uid16) != 0) {
-                        fprintf(stderr, "%s probably not smb-filesystem\n",
-                                mount_point);
-                        return -1;
-                }
-                mount_uid = mount_uid16;
-        }
-
-        if ((getuid() != 0)
-            && (mount_uid != getuid())) {
-                fprintf(stderr, "You are not allowed to umount %s\n",
-                        mount_point);
-                return -1;
-        }
-
-        close(fid);
-        return 0;
-}
-
-/* Make a canonical pathname from PATH.  Returns a freshly malloced string.
-   It is up the *caller* to ensure that the PATH is sensible.  i.e.
-   canonicalize ("/dev/fd0/.") returns "/dev/fd0" even though ``/dev/fd0/.''
-   is not a legal pathname for ``/dev/fd0''  Anything we cannot parse
-   we return unmodified.   */
-static char *
-canonicalize (char *path)
-{
-	char *canonical = (char*)malloc (PATH_MAX + 1);
-
-	if (!canonical) {
-		fprintf(stderr, "Error! Not enough memory!\n");
-		return NULL;
-	}
-
-	if (strlen(path) > PATH_MAX) {
-		fprintf(stderr, "Mount point string too long\n");
-		return NULL;
-	}
-
-	if (path == NULL)
-		return NULL;
-
-	if (realpath (path, canonical))
-		return canonical;
-
-	strncpy (canonical, path, PATH_MAX);
-	canonical[PATH_MAX] = '\0';
-	return canonical;
-}
-
-
-int
-main(int argc, char *argv[])
-{
-        int fd;
-        char* mount_point;
-        struct mntent *mnt;
-        FILE* mtab;
-        FILE* new_mtab;
-	TALLOC_CTX *frame = talloc_stackframe();
-
-        if (argc != 2) {
-                usage();
-                exit(1);
-        }
-
-        if (geteuid() != 0) {
-                fprintf(stderr, "smbumount must be installed suid root\n");
-                exit(1);
-        }
-
-        mount_point = canonicalize(argv[1]);
-
-	if (mount_point == NULL)
-	{
-		exit(1);
-	}
-
-        if (umount_ok(mount_point) != 0) {
-                exit(1);
-        }
-
-        if (umount(mount_point) != 0) {
-                fprintf(stderr, "Could not umount %s: %s\n",
-                        mount_point, strerror(errno));
-                exit(1);
-        }
-
-        if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1)
-        {
-                fprintf(stderr, "Can't get "MOUNTED"~ lock file");
-                return 1;
-        }
-        close(fd);
-
-        if ((mtab = setmntent(MOUNTED, "r")) == NULL) {
-                fprintf(stderr, "Can't open " MOUNTED ": %s\n",
-                        strerror(errno));
-                return 1;
-        }
-
-#define MOUNTED_TMP MOUNTED".tmp"
-
-        if ((new_mtab = setmntent(MOUNTED_TMP, "w")) == NULL) {
-                fprintf(stderr, "Can't open " MOUNTED_TMP ": %s\n",
-                        strerror(errno));
-                endmntent(mtab);
-                return 1;
-        }
-
-        while ((mnt = getmntent(mtab)) != NULL) {
-                if (strcmp(mnt->mnt_dir, mount_point) != 0) {
-                        addmntent(new_mtab, mnt);
-                }
-        }
-
-        endmntent(mtab);
-
-        if (fchmod (fileno (new_mtab), S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH) < 0) {
-                fprintf(stderr, "Error changing mode of %s: %s\n",
-                        MOUNTED_TMP, strerror(errno));
-                exit(1);
-        }
-
-        endmntent(new_mtab);
-
-        if (rename(MOUNTED_TMP, MOUNTED) < 0) {
-                fprintf(stderr, "Cannot rename %s to %s: %s\n",
-                        MOUNTED, MOUNTED_TMP, strerror(errno));
-                exit(1);
-        }
-
-        if (unlink(MOUNTED"~") == -1)
-        {
-                fprintf(stderr, "Can't remove "MOUNTED"~");
-                return 1;
-        }
-
-	TALLOC_FREE(frame);
-	return 0;
-}
diff --git a/source3/configure.in b/source3/configure.in
index 4fadfd7ae0..5de8a289db 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -114,7 +114,6 @@ AC_SUBST(INSTALL_PAM_MODULES)
 AC_SUBST(UNINSTALL_PAM_MODULES)
 AC_SUBST(NSS_MODULES)
 AC_SUBST(EXTRA_BIN_PROGS)
-AC_SUBST(SMBMOUNT_PROGS)
 AC_SUBST(CIFSMOUNT_PROGS)
 AC_SUBST(INSTALL_CIFSMOUNT)
 AC_SUBST(UNINSTALL_CIFSMOUNT)
@@ -3991,31 +3990,6 @@ AC_ARG_WITH(automount,
 )
 
 #################################################
-# check for smbmount support
-AC_MSG_CHECKING(whether to use smbmount)
-AC_ARG_WITH(smbmount,
-[AS_HELP_STRING([--with-smbmount], [Include smbmount (Linux only) support (default=no)])],
-[ case "$withval" in
-  yes)
-	case "$host_os" in
-	*linux*)
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(WITH_SMBMOUNT,1,[Whether to build smbmount])
-		SMBMOUNT_PROGS="bin/smbmount bin/smbmnt bin/smbumount"
-		;;
-	*)
-		AC_MSG_ERROR(not on a linux system!)
-		;;
-	esac
-    ;;
-  *)
-    AC_MSG_RESULT(no)
-    ;;
-  esac ],
-  AC_MSG_RESULT(no)
-)
-
-#################################################
 # check for mount- and umount.cifs support
 CIFSMOUNT_PROGS=""
 INSTALL_CIFSMOUNT=""
diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h
index 463a2bdb0b..c98c4244de 100644
--- a/source3/include/smb_macros.h
+++ b/source3/include/smb_macros.h
@@ -305,10 +305,9 @@ NULL returns on zero request. JRA.
 #define talloc_destroy(ctx) talloc_free(ctx)
 #define TALLOC_FREE(ctx) do { if ((ctx) != NULL) {talloc_free(ctx); ctx=NULL;} } while(0)
 
-/* only define PARANOID_MALLOC_CHECKER with --enable-developer and not compiling
-   the smbmount utils */
+/* only define PARANOID_MALLOC_CHECKER with --enable-developer */
 
-#if defined(DEVELOPER) && !defined(SMBMOUNT_MALLOC)
+#if defined(DEVELOPER)
 #  define PARANOID_MALLOC_CHECKER 1
 #endif
 
diff --git a/source3/script/installbin.sh.in b/source3/script/installbin.sh.in
index 59a6c31ca8..c607d9e445 100755
--- a/source3/script/installbin.sh.in
+++ b/source3/script/installbin.sh.in
@@ -19,15 +19,6 @@ for p in $*; do
  fi
  cp $p $DESTDIR/$BINDIR/
  chmod $INSTALLPERMS $DESTDIR/$BINDIR/$p2
-
- # this is a special case, mount needs this in a specific location
- if [ $p2 = smbmount ]; then
-   if [ ! -d $DESTDIR/@rootsbindir@ ]; then
-      mkdir $DESTDIR/@rootsbindir@
-   fi
-   echo "Creating sym link $DESTDIR/@rootsbindir@/mount.smbfs to $BINDIR/$p2 "
-   ln -sf $BINDIR/$p2 $DESTDIR/@rootsbindir@/mount.smbfs
- fi
 done
 
 
diff --git a/source3/script/installman.sh b/source3/script/installman.sh
index 7edc707ab0..869ce6ee38 100755
--- a/source3/script/installman.sh
+++ b/source3/script/installman.sh
@@ -49,7 +49,6 @@ for lang in $langs; do
 	    # Check if this man page if required by the configured feature set
 	    case "${MP_BASENAME}" in
 	    	smbsh.1) test -z "${SMBWRAPPER}" && continue ;;
-		smbmnt.8|smbmount.8|smbumount.8) test -z "${SMBMOUNT_PROGS}" && continue ;;
 		*) ;;
 	    esac
 
diff --git a/source3/script/uninstallbin.sh.in b/source3/script/uninstallbin.sh.in
index e1bbf6ecb1..8064db8d95 100755
--- a/source3/script/uninstallbin.sh.in
+++ b/source3/script/uninstallbin.sh.in
@@ -26,12 +26,6 @@ for p in $*; do
       echo "Cannot remove $DESTDIR/$BINDIR/$p2 ... does $USER have privileges? "
     fi
   fi
-
-  # this is a special case, mount needs this in a specific location
-  if test "$p2" = smbmount -a -f "$DESTDIR/sbin/mount.smbfs"; then
-    echo "Removing $DESTDIR/sbin/mount.smbfs "
-    rm -f "$DESTDIR/@rootsbindir@/sbin/mount.smbfs"
-  fi
 done