[Pkg-samba-maint] r1614 - in trunk/samba/debian: . patches
vorlon at alioth.debian.org
vorlon at alioth.debian.org
Sun Nov 25 09:06:05 UTC 2007
Author: vorlon
Date: 2007-11-25 09:06:05 +0000 (Sun, 25 Nov 2007)
New Revision: 1614
Added:
trunk/samba/debian/mount.smbfs
trunk/samba/debian/smbfs.dirs
trunk/samba/debian/smbfs.links
Removed:
trunk/samba/debian/patches/hide_password_length.patch
trunk/samba/debian/patches/missing_userspace_bugzilla999.patch
trunk/samba/debian/patches/no_smbmount_symlink.patch
trunk/samba/debian/patches/smbmount-mtab-flags.patch
trunk/samba/debian/patches/smbmount-nomtab.patch
Modified:
trunk/samba/debian/patches/series
trunk/samba/debian/rules
trunk/samba/debian/smbfs.files
Log:
merge revisions 1599-1613 from the no-more-smbfs branch
Copied: trunk/samba/debian/mount.smbfs (from rev 1613, branches/samba/no-more-smbfs/debian/mount.smbfs)
===================================================================
--- trunk/samba/debian/mount.smbfs (rev 0)
+++ trunk/samba/debian/mount.smbfs 2007-11-25 09:06:05 UTC (rev 1614)
@@ -0,0 +1,110 @@
+#!/bin/sh
+# Debian mount.smbfs compatibility wrapper
+# Copyright 2007, Steve Langasek <vorlon at debian.org>
+# Licensed under the GNU General Public License, version 2. See the
+# file /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
+
+# This script accepts all documented mount options for mount.smbfs,
+# passing through those that are also recognized by mount.cifs,
+# converting those that are not recognized but map to available cifs
+# options, and warning about the use of options for which no equivalent
+# exists.
+
+# known bugs: quoted spaces in arguments are not passed intact
+
+set -e
+
+# reverse the order of username and password in a "username" parameter,
+# taking care to leave any "%password" bit intact
+
+reverse_username_workgroup() {
+ local workgroup password username
+
+ username="$1"
+ case "$username" in
+ *%*) password="${username#*%}"
+ username="${username%%%*}"
+ ;;
+ *) ;;
+ esac
+ case "$username" in
+ */*) workgroup="${username#*/}"
+ username="${username%%/*}"
+ ;;
+ *) ;;
+ esac
+ if [ -n "$workgroup" ]; then
+ username="$workgroup\\$username"
+ fi
+ if [ -n "$password" ]; then
+ username="$username%$password"
+ fi
+ echo "$username"
+}
+
+
+# parse out the mount options that have been specified using -o, and if
+# necessary, convert them for use by mount.cifs
+
+parse_mount_options () {
+ local OLD_IFS IFS options option username
+ OLD_IFS="$IFS"
+ IFS=","
+ options=""
+ workgroup=""
+ password=""
+
+ for option in $@; do
+ case "$option" in
+ sockopt=* | scope=* | codepage=* | ttl=* | debug=*)
+ echo "Warning: ignoring deprecated smbfs option '$option'" >&2
+ ;;
+
+ krb)
+ options="$options${options:+,}sec=krb5"
+ ;;
+
+ # username and workgroup are reversed in username= arguments,
+ # so need to be parsed out
+ username=*/*)
+ IFS="$OLD_IFS"
+ username="${option#username=}"
+ username="$(reverse_username_workgroup "$username")"
+ IFS=","
+ options="$options${options:+,}username=$username"
+ ;;
+
+ *)
+ options="$options${options:+,}$option"
+ ;;
+ esac
+ done
+ IFS="$OLD_IFS"
+ echo $options
+}
+
+args=""
+while [ "$#" -gt 0 ]; do
+ case "$1" in
+ -o*)
+ arg=${1#-o}
+ shift
+ if [ -z "$arg" ]; then
+ arg=$1
+ shift
+ fi
+ arg="$(parse_mount_options "$arg")"
+ if [ -n "$arg" ]; then
+ args="$args -o $arg"
+ fi
+ ;;
+ *)
+ args="$args $1"
+ shift
+ ;;
+ esac
+done
+
+USER="$(reverse_username_workgroup "$USER")"
+
+exec /sbin/mount.cifs $args
Deleted: trunk/samba/debian/patches/hide_password_length.patch
===================================================================
--- trunk/samba/debian/patches/hide_password_length.patch 2007-11-25 08:56:52 UTC (rev 1613)
+++ trunk/samba/debian/patches/hide_password_length.patch 2007-11-25 09:06:05 UTC (rev 1614)
@@ -1,42 +0,0 @@
-Goal: Seems to be meant to avoid one to guess the password's length
- by how many Xs are left in the argv buffer
-
-Fixes: some paranoid coniderations?
-
-Status wrt upstream: Forwarded on 2007/05/30
-
-Author: Unknown
-
-Note:
-
-Index: samba-3.0.25a/source/client/smbmount.c
-===================================================================
---- samba-3.0.25a.orig/source/client/smbmount.c 2007-05-26 07:45:39.744216228 +0200
-+++ samba-3.0.25a/source/client/smbmount.c 2007-05-26 07:46:32.692638041 +0200
-@@ -768,7 +768,7 @@
- *lp = 0;
- pstrcpy(password,lp+1);
- got_pass = True;
-- memset(strchr_m(opteq+1,'%')+1,'X',strlen(password));
-+ memset(strchr_m(opteq+1,'%')+1,'\0',strlen(password));
- }
- if ((lp=strchr_m(username,'/'))) {
- *lp = 0;
-@@ -778,7 +778,7 @@
- !strcmp(opts, "password")) {
- pstrcpy(password,opteq+1);
- got_pass = True;
-- memset(opteq+1,'X',strlen(password));
-+ memset(opteq+1,'\0',strlen(password));
- } else if(!strcmp(opts, "credentials")) {
- pstrcpy(credentials,opteq+1);
- } else if(!strcmp(opts, "netbiosname")) {
-@@ -892,7 +892,7 @@
- *p = 0;
- pstrcpy(password,p+1);
- got_pass = True;
-- memset(strchr_m(getenv("USER"),'%')+1,'X',strlen(password));
-+ memset(strchr_m(getenv("USER"),'%')+1,'\0',strlen(password));
- }
- strupper_m(username);
- }
Deleted: trunk/samba/debian/patches/missing_userspace_bugzilla999.patch
===================================================================
--- trunk/samba/debian/patches/missing_userspace_bugzilla999.patch 2007-11-25 08:56:52 UTC (rev 1613)
+++ trunk/samba/debian/patches/missing_userspace_bugzilla999.patch 2007-11-25 09:06:05 UTC (rev 1614)
@@ -1,144 +0,0 @@
-Goal: Userspaces fixes to properly use uid and gid options with kernel 2.6
-
-Fixes: Bugzilla #999
-
-Status wrt upstream: Not applied. Mentioned by Dann Frazier in
- http://lists.samba.org/archive/samba-technical/2007-January/051069.html
- Jerry Carter agreed to apply but not applied yet
- Reminded to upstream on June 3rd 2007
-
-Author: Haroldo Gamal (see https://bugzilla.samba.org/attachment.cgi?id=634&action=view)
-
-
-Index: samba-3.0.25c/source/client/smbmnt.c
-===================================================================
---- samba-3.0.25c.orig/source/client/smbmnt.c 2007-08-26 13:09:03.919628296 +0200
-+++ samba-3.0.25c/source/client/smbmnt.c 2007-08-26 13:09:07.919433127 +0200
-@@ -49,6 +49,10 @@
- static unsigned mount_dmask;
- static int user_mount;
- static char *options;
-+static int opt_uid = 0;
-+static int opt_gid = 0;
-+static int opt_fmode = 0;
-+static int opt_dmode = 0;
-
- static void
- help(void)
-@@ -82,11 +86,13 @@
- case 'u':
- if (!user_mount) {
- mount_uid = strtol(optarg, NULL, 0);
-+ opt_uid++;
- }
- break;
- case 'g':
- if (!user_mount) {
- mount_gid = strtol(optarg, NULL, 0);
-+ opt_gid++;
- }
- break;
- case 'n':
-@@ -97,9 +103,11 @@
- break;
- case 'f':
- mount_fmask = strtol(optarg, NULL, 8);
-+ opt_fmode++;
- break;
- case 'd':
- mount_dmask = strtol(optarg, NULL, 8);
-+ opt_dmode++;
- break;
- case 'o':
- options = optarg;
-@@ -182,9 +190,17 @@
- data2 = (char *) data;
- }
-
-- slprintf(opts, sizeof(opts)-1,
-- "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);
-+ slprintf(opts, sizeof(opts)-1, "version=7,");
-+ if (opt_uid)
-+ slprintf(opts+strlen(opts), sizeof(opts)-strlen(opts)-1, "uid=%d,", mount_uid);
-+ if (opt_gid)
-+ slprintf(opts+strlen(opts), sizeof(opts)-strlen(opts)-1, "gid=%d,", mount_gid);
-+ if (opt_fmode)
-+ slprintf(opts+strlen(opts), sizeof(opts)-strlen(opts)-1, "file_mode=%d,", data->file_mode);
-+ if (opt_dmode)
-+ slprintf(opts+strlen(opts), sizeof(opts)-strlen(opts)-1, "dir_mode=%d,", data->dir_mode);
-+ slprintf(opts+strlen(opts), sizeof(opts)-strlen(opts)-1, "%s",options);
-+
- if (mount(share_name, ".", "smbfs", flags, data1) == 0)
- return 0;
- return mount(share_name, ".", "smbfs", flags, data2);
-@@ -213,6 +229,8 @@
-
- if (getuid() != 0) {
- user_mount = 1;
-+ opt_uid++;
-+ opt_gid++;
- }
-
- if (geteuid() != 0) {
-Index: samba-3.0.25c/source/client/smbmount.c
-===================================================================
---- samba-3.0.25c.orig/source/client/smbmount.c 2007-08-26 13:09:03.919628296 +0200
-+++ samba-3.0.25c/source/client/smbmount.c 2007-08-26 13:09:07.919433127 +0200
-@@ -43,6 +43,10 @@
- static int smb_port = 0;
- static BOOL got_user;
- static BOOL got_pass;
-+static BOOL use_uid = 0;
-+static BOOL use_gid = 0;
-+static BOOL use_fmask = 0;
-+static BOOL use_dmask = 0;
- static uid_t mount_uid;
- static gid_t mount_gid;
- static int mount_ro;
-@@ -480,22 +484,22 @@
- if (mount_ro) {
- args[i++] = "-r";
- }
-- if (mount_uid) {
-+ if (use_uid) {
- slprintf(tmp, sizeof(tmp)-1, "%d", mount_uid);
- args[i++] = "-u";
- args[i++] = smb_xstrdup(tmp);
- }
-- if (mount_gid) {
-+ if (use_gid) {
- slprintf(tmp, sizeof(tmp)-1, "%d", mount_gid);
- args[i++] = "-g";
- args[i++] = smb_xstrdup(tmp);
- }
-- if (mount_fmask) {
-+ if (use_fmask) {
- slprintf(tmp, sizeof(tmp)-1, "0%o", mount_fmask);
- args[i++] = "-f";
- args[i++] = smb_xstrdup(tmp);
- }
-- if (mount_dmask) {
-+ if (use_dmask) {
- slprintf(tmp, sizeof(tmp)-1, "0%o", mount_dmask);
- args[i++] = "-d";
- args[i++] = smb_xstrdup(tmp);
-@@ -800,14 +804,18 @@
- pstrcpy(my_netbios_name,opteq+1);
- } else if(!strcmp(opts, "uid")) {
- mount_uid = nametouid(opteq+1);
-+ use_uid++;
- } else if(!strcmp(opts, "gid")) {
- mount_gid = nametogid(opteq+1);
-+ use_gid++;
- } else if(!strcmp(opts, "port")) {
- smb_port = val;
- } else if(!strcmp(opts, "fmask")) {
- mount_fmask = strtol(opteq+1, NULL, 8);
-+ use_fmask++;
- } else if(!strcmp(opts, "dmask")) {
- mount_dmask = strtol(opteq+1, NULL, 8);
-+ use_dmask++;
- } else if(!strcmp(opts, "debug")) {
- DEBUGLEVEL = val;
- } else if(!strcmp(opts, "ip")) {
Deleted: trunk/samba/debian/patches/no_smbmount_symlink.patch
===================================================================
--- trunk/samba/debian/patches/no_smbmount_symlink.patch 2007-11-25 08:56:52 UTC (rev 1613)
+++ trunk/samba/debian/patches/no_smbmount_symlink.patch 2007-11-25 09:06:05 UTC (rev 1614)
@@ -1,35 +0,0 @@
-Goal: installing smbmount and smbumount is done The Debian Way in debian/rules
-
-Fixes: ?
-
-Status wrt upstream: Debian specific
-
-Note:
-
-Index: samba-3.0.25c/source/script/installbin.sh.in
-===================================================================
---- samba-3.0.25c.orig/source/script/installbin.sh.in 2007-08-26 12:07:16.598298995 +0200
-+++ samba-3.0.25c/source/script/installbin.sh.in 2007-08-26 13:09:02.919677088 +0200
-@@ -21,13 +21,15 @@
- 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
-+ # Commented out for the Debian Samba package. We take care of this
-+ # important symlink in debian/rules. (peloy at debian.org)
-+ # 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
-
-
Modified: trunk/samba/debian/patches/series
===================================================================
--- trunk/samba/debian/patches/series 2007-11-25 08:56:52 UTC (rev 1613)
+++ trunk/samba/debian/patches/series 2007-11-25 09:06:05 UTC (rev 1614)
@@ -7,16 +7,12 @@
non-linux-ports.patch
pam-examples.patch
README_nosmbldap-tools.patch
-no_smbmount_symlink.patch
smbclient-pager.patch
-smbmount-mtab-flags.patch
-smbmount-nomtab.patch
smbstatus-locking.patch
undefined-symbols.patch
VERSION.patch
adapt_machine_creation_script.patch
autoconf.patch
-missing_userspace_bugzilla999.patch
linux-cifs-user-perms.patch
cifs-umount-same-user.patch
smbpasswd-syslog.patch
Deleted: trunk/samba/debian/patches/smbmount-mtab-flags.patch
===================================================================
--- trunk/samba/debian/patches/smbmount-mtab-flags.patch 2007-11-25 08:56:52 UTC (rev 1613)
+++ trunk/samba/debian/patches/smbmount-mtab-flags.patch 2007-11-25 09:06:05 UTC (rev 1614)
@@ -1,26 +0,0 @@
-Goal: Always put the "ro|rw" option in mtab
-
-Fixes: #140397?
-
-Status wrt upstream: Forwarded on 2007/05/30
-
-Author: Steve Langasek <vorlon at debian.org>
-
-Note:
-
-Index: samba-3.0.25c/source/client/smbmnt.c
-===================================================================
---- samba-3.0.25c.orig/source/client/smbmnt.c 2007-08-26 12:07:16.098322677 +0200
-+++ samba-3.0.25c/source/client/smbmnt.c 2007-08-26 13:09:03.419652692 +0200
-@@ -276,7 +276,10 @@
- ment.mnt_fsname = share_name ? share_name : "none";
- ment.mnt_dir = mount_point;
- ment.mnt_type = "smbfs";
-- ment.mnt_opts = "";
-+ if (mount_ro)
-+ ment.mnt_opts = "ro";
-+ else
-+ ment.mnt_opts = "rw";
- ment.mnt_freq = 0;
- ment.mnt_passno= 0;
-
Deleted: trunk/samba/debian/patches/smbmount-nomtab.patch
===================================================================
--- trunk/samba/debian/patches/smbmount-nomtab.patch 2007-11-25 08:56:52 UTC (rev 1613)
+++ trunk/samba/debian/patches/smbmount-nomtab.patch 2007-11-25 09:06:05 UTC (rev 1614)
@@ -1,172 +0,0 @@
-Goal: Add an option to not update mtab. This allows using smbfs when
- the root filesystem is mounted read-only
-
-Fixes: #139590
-
-Status wrt upstream: Forwarded on 2007/05/30
-
-Note: Part of no-longer maintained smbfs stuff?
- The manpages are not modified
-
-Index: samba-3.0.25c/source/client/smbmnt.c
-===================================================================
---- samba-3.0.25c.orig/source/client/smbmnt.c 2007-08-26 13:09:03.419652692 +0200
-+++ samba-3.0.25c/source/client/smbmnt.c 2007-08-26 13:09:03.919628296 +0200
-@@ -44,6 +44,7 @@
- static uid_t mount_uid;
- static gid_t mount_gid;
- static int mount_ro;
-+static int no_mtab;
- static unsigned mount_fmask;
- static unsigned mount_dmask;
- static int user_mount;
-@@ -56,6 +57,7 @@
- printf("Usage: smbmnt mount-point [options]\n");
- printf("Version %s\n\n",SAMBA_VERSION_STRING);
- printf("-s share share name on server\n"
-+ "-n don't update /etc/mtab\n"
- "-r mount read-only\n"
- "-u uid mount as uid\n"
- "-g gid mount as gid\n"
-@@ -70,7 +72,7 @@
- {
- int opt;
-
-- while ((opt = getopt (argc, argv, "s:u:g:rf:d:o:")) != EOF)
-+ while ((opt = getopt (argc, argv, "s:u:g:nrf:d:o:")) != EOF)
- {
- switch (opt)
- {
-@@ -87,6 +89,9 @@
- mount_gid = strtol(optarg, NULL, 0);
- }
- break;
-+ case 'n':
-+ no_mtab = 1;
-+ break;
- case 'r':
- mount_ro = 1;
- break;
-@@ -291,36 +296,38 @@
- 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 (!no_mtab) {
-+ 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 ((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 (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;
-- }
-+ if (unlink(MOUNTED"~") == -1)
-+ {
-+ fprintf(stderr, "Can't remove "MOUNTED"~");
-+ return 1;
-+ }
-+ }
-
- return 0;
- }
-Index: samba-3.0.25c/source/client/smbmount.c
-===================================================================
---- samba-3.0.25c.orig/source/client/smbmount.c 2007-08-26 12:07:16.098322677 +0200
-+++ samba-3.0.25c/source/client/smbmount.c 2007-08-26 13:09:03.919628296 +0200
-@@ -48,6 +48,7 @@
- static int mount_ro;
- static unsigned mount_fmask;
- static unsigned mount_dmask;
-+static BOOL no_mtab = False;
- static BOOL use_kerberos;
- /* TODO: Add code to detect smbfs version in kernel */
- static BOOL status32_smbfs = False;
-@@ -273,6 +274,9 @@
- return;
- }
-
-+ if (no_mtab)
-+ 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;
-@@ -470,6 +474,9 @@
- args[i++] = "-s";
- args[i++] = svc2;
-
-+ if (no_mtab) {
-+ args[i++] = "-n";
-+ }
- if (mount_ro) {
- args[i++] = "-r";
- }
-@@ -665,7 +672,7 @@
- ****************************************************************************/
- static void usage(void)
- {
-- printf("Usage: mount.smbfs service mountpoint [-o options,...]\n");
-+ printf("Usage: mount.smbfs service mountpoint [-n] [-o options,...]\n");
-
- printf("Version %s\n\n",SAMBA_VERSION_STRING);
-
-@@ -745,8 +752,13 @@
- argc -= 2;
- argv += 2;
-
-- opt = getopt(argc, argv, "o:");
-- if(opt != 'o') {
-+ opt = getopt(argc, argv, "no:");
-+ if (opt == 'n') {
-+ DEBUG(3,("No mtab!\n"));
-+ no_mtab = True;
-+ opt = getopt(argc, argv, "o:");
-+ }
-+ if (opt != 'o') {
- return;
- }
-
Modified: trunk/samba/debian/rules
===================================================================
--- trunk/samba/debian/rules 2007-11-25 08:56:52 UTC (rev 1613)
+++ trunk/samba/debian/rules 2007-11-25 09:06:05 UTC (rev 1614)
@@ -52,17 +52,18 @@
--with-automount \
--with-ldap \
--with-ads \
+ --without-smbmount \
--with-dnsupdate
ifeq ($(DEB_HOST_ARCH_OS),linux)
conf_args += \
- --with-smbmount --with-cifsmount \
+ --with-cifsmount \
--with-acl-support \
--with-quotas
mount_cifs = yes
smbfs = yes
else
- conf_args += --without-quotas --without-smbmount --without-cifsmount
+ conf_args += --without-quotas --without-cifsmount
mount_cifs = no
smbfs = no
endif
@@ -147,16 +148,8 @@
install -m 0644 source/nsswitch/libnss_winbind.so $(DESTDIR)/lib/libnss_winbind.so.2
install -m 0644 source/nsswitch/libnss_wins.so $(DESTDIR)/lib/libnss_wins.so.2
-ifeq ($(smbfs),yes)
- # Create the symlinks that will allow us to do "mount -t smbfs ..."
- # and "mount -t smb ...". Note that the source/script/installbin.sh
- # tries to create the first symlink, but we have commented
- # that code out and do everything here. We also create
- # symlinks for the man pages.
- ln -s /usr/bin/smbmount $(DESTDIR)/sbin/mount.smbfs
- ln -s /usr/bin/smbmount $(DESTDIR)/sbin/mount.smb
- ln -s smbmount.8 $(DESTDIR)/usr/share/man/man8/mount.smb.8
- ln -s smbmount.8 $(DESTDIR)/usr/share/man/man8/mount.smbfs.8
+ifeq ($(mount_cifs),yes)
+ install -m 0755 debian/mount.smbfs $(DESTDIR)/sbin/mount.smbfs
endif
# For CUPS to support printing to samba printers, it's necessary
@@ -224,14 +217,6 @@
# it becomes executable
chmod a-x debian/libsmbclient-dev/usr/include/libsmbclient.h
-ifeq ($(smbfs),yes)
- # The smbmnt and smbumount binaries should be setuid-root. This
- # has security implications because these programs haven't had
- # a thorough security audit. smbmount _does not_ have to have
- # the setuid bit set. In fact, it is a security hole.
- chmod u+s debian/smbfs/usr/bin/smbmnt
- chmod ug+s debian/smbfs/usr/bin/smbumount
-endif
ifeq ($(mount_cifs),yes)
chmod u+s debian/smbfs/sbin/mount.cifs
chmod u+s debian/smbfs/sbin/umount.cifs
Copied: trunk/samba/debian/smbfs.dirs (from rev 1613, branches/samba/no-more-smbfs/debian/smbfs.dirs)
===================================================================
--- trunk/samba/debian/smbfs.dirs (rev 0)
+++ trunk/samba/debian/smbfs.dirs 2007-11-25 09:06:05 UTC (rev 1614)
@@ -0,0 +1 @@
+sbin
Modified: trunk/samba/debian/smbfs.files
===================================================================
--- trunk/samba/debian/smbfs.files 2007-11-25 08:56:52 UTC (rev 1613)
+++ trunk/samba/debian/smbfs.files 2007-11-25 09:06:05 UTC (rev 1614)
@@ -1,14 +1,5 @@
sbin/mount.smbfs
-sbin/mount.smb
sbin/mount.cifs
sbin/umount.cifs
-usr/bin/smbmount
-usr/bin/smbumount
-usr/bin/smbmnt
-usr/share/man/man8/smbmount.8
-usr/share/man/man8/smbumount.8
-usr/share/man/man8/smbmnt.8
-usr/share/man/man8/mount.smb.8
-usr/share/man/man8/mount.smbfs.8
usr/share/man/man8/mount.cifs.8
usr/share/man/man8/umount.cifs.8
Copied: trunk/samba/debian/smbfs.links (from rev 1613, branches/samba/no-more-smbfs/debian/smbfs.links)
===================================================================
--- trunk/samba/debian/smbfs.links (rev 0)
+++ trunk/samba/debian/smbfs.links 2007-11-25 09:06:05 UTC (rev 1614)
@@ -0,0 +1,5 @@
+sbin/mount.smbfs usr/bin/smbmount
+sbin/umount.cifs usr/bin/smbumount
+usr/share/man/man8/umount.cifs.8 usr/share/man/man8/smbumount.8
+usr/share/man/man8/mount.cifs.8 usr/share/man/man8/smbmount.8
+usr/share/man/man8/mount.cifs.8 usr/share/man/man8/mount.smbfs.8
More information about the Pkg-samba-maint
mailing list