mirror of
https://github.com/samba-team/samba.git
synced 2024-12-25 23:21:54 +03:00
Remove smbmount.
Karolin
This commit is contained in:
Karolin Seeger
parent
be5ee4999e
commit
5fbd98f706
@ -208,7 +208,7 @@ TORTURE_PROGS = bin/smbtorture@EXEEXT@ bin/msgtest@EXEEXT@ \
|
|||||||
bin/pdbtest@EXEEXT@ bin/talloctort@EXEEXT@ bin/replacetort@EXEEXT@ \
|
bin/pdbtest@EXEEXT@ bin/talloctort@EXEEXT@ bin/replacetort@EXEEXT@ \
|
||||||
bin/tdbtorture@EXEEXT@
|
bin/tdbtorture@EXEEXT@
|
||||||
|
|
||||||
BIN_PROGS = @EXTRA_BIN_PROGS@ @SMBMOUNT_PROGS@ \
|
BIN_PROGS = @EXTRA_BIN_PROGS@ \
|
||||||
$(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3) $(BIN_PROGS4)
|
$(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3) $(BIN_PROGS4)
|
||||||
|
|
||||||
EVERYTHING_PROGS = bin/debug2html@EXEEXT@ bin/smbfilter@EXEEXT@ \
|
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) \
|
CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
|
||||||
$(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(SECRETS_OBJ) $(POPT_LIB_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_MOUNT_OBJ = client/mount.cifs.o
|
||||||
|
|
||||||
CIFS_UMOUNT_OBJ = client/umount.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 $@
|
@echo Linking $@
|
||||||
@$(CC) $(FLAGS) -o $@ $(CUPS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@
|
@$(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@
|
bin/mount.cifs@EXEEXT@: $(BINARY_PREREQS) $(CIFS_MOUNT_OBJ) @BUILD_POPT@
|
||||||
@echo Linking $@
|
@echo Linking $@
|
||||||
@$(CC) $(FLAGS) -o $@ $(CIFS_MOUNT_OBJ) $(DYNEXP) $(LDFLAGS) @POPTLIBS@
|
@$(CC) $(FLAGS) -o $@ $(CIFS_MOUNT_OBJ) $(DYNEXP) $(LDFLAGS) @POPTLIBS@
|
||||||
@ -2051,8 +2031,7 @@ revert:
|
|||||||
@$(SHELL) $(srcdir)/script/revert.sh $(BINDIR) $(BIN_PROGS) $(SCRIPTS)
|
@$(SHELL) $(srcdir)/script/revert.sh $(BINDIR) $(BIN_PROGS) $(SCRIPTS)
|
||||||
|
|
||||||
installman: installdirs
|
installman: installdirs
|
||||||
@SMBMOUNT_PROGS="@SMBMOUNT_PROGS@" $(SHELL) \
|
@$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(MANDIR) $(srcdir) C "@ROFF@"
|
||||||
$(srcdir)/script/installman.sh $(DESTDIR)$(MANDIR) $(srcdir) C "@ROFF@"
|
|
||||||
|
|
||||||
.PHONY: showlayout
|
.PHONY: showlayout
|
||||||
|
|
||||||
|
|||||||
@ -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;
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -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;
|
|
||||||
}
|
|
||||||
@ -114,7 +114,6 @@ AC_SUBST(INSTALL_PAM_MODULES)
|
|||||||
AC_SUBST(UNINSTALL_PAM_MODULES)
|
AC_SUBST(UNINSTALL_PAM_MODULES)
|
||||||
AC_SUBST(NSS_MODULES)
|
AC_SUBST(NSS_MODULES)
|
||||||
AC_SUBST(EXTRA_BIN_PROGS)
|
AC_SUBST(EXTRA_BIN_PROGS)
|
||||||
AC_SUBST(SMBMOUNT_PROGS)
|
|
||||||
AC_SUBST(CIFSMOUNT_PROGS)
|
AC_SUBST(CIFSMOUNT_PROGS)
|
||||||
AC_SUBST(INSTALL_CIFSMOUNT)
|
AC_SUBST(INSTALL_CIFSMOUNT)
|
||||||
AC_SUBST(UNINSTALL_CIFSMOUNT)
|
AC_SUBST(UNINSTALL_CIFSMOUNT)
|
||||||
@ -3990,31 +3989,6 @@ AC_ARG_WITH(automount,
|
|||||||
AC_MSG_RESULT(no)
|
AC_MSG_RESULT(no)
|
||||||
)
|
)
|
||||||
|
|
||||||
#################################################
|
|
||||||
# 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
|
# check for mount- and umount.cifs support
|
||||||
CIFSMOUNT_PROGS=""
|
CIFSMOUNT_PROGS=""
|
||||||
|
|||||||
@ -305,10 +305,9 @@ NULL returns on zero request. JRA.
|
|||||||
#define talloc_destroy(ctx) talloc_free(ctx)
|
#define talloc_destroy(ctx) talloc_free(ctx)
|
||||||
#define TALLOC_FREE(ctx) do { if ((ctx) != NULL) {talloc_free(ctx); ctx=NULL;} } while(0)
|
#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
|
/* only define PARANOID_MALLOC_CHECKER with --enable-developer */
|
||||||
the smbmount utils */
|
|
||||||
|
|
||||||
#if defined(DEVELOPER) && !defined(SMBMOUNT_MALLOC)
|
#if defined(DEVELOPER)
|
||||||
# define PARANOID_MALLOC_CHECKER 1
|
# define PARANOID_MALLOC_CHECKER 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@ -19,15 +19,6 @@ for p in $*; do
|
|||||||
fi
|
fi
|
||||||
cp $p $DESTDIR/$BINDIR/
|
cp $p $DESTDIR/$BINDIR/
|
||||||
chmod $INSTALLPERMS $DESTDIR/$BINDIR/$p2
|
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
|
done
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -49,7 +49,6 @@ for lang in $langs; do
|
|||||||
# Check if this man page if required by the configured feature set
|
# Check if this man page if required by the configured feature set
|
||||||
case "${MP_BASENAME}" in
|
case "${MP_BASENAME}" in
|
||||||
smbsh.1) test -z "${SMBWRAPPER}" && continue ;;
|
smbsh.1) test -z "${SMBWRAPPER}" && continue ;;
|
||||||
smbmnt.8|smbmount.8|smbumount.8) test -z "${SMBMOUNT_PROGS}" && continue ;;
|
|
||||||
*) ;;
|
*) ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|||||||
@ -26,12 +26,6 @@ for p in $*; do
|
|||||||
echo "Cannot remove $DESTDIR/$BINDIR/$p2 ... does $USER have privileges? "
|
echo "Cannot remove $DESTDIR/$BINDIR/$p2 ... does $USER have privileges? "
|
||||||
fi
|
fi
|
||||||
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
|
done
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user