[Pkg-samba-maint] r1601 - branches/samba/no-more-smbfs/debian

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2007-11-24 10:03:56 +0000 (Sat, 24 Nov 2007)
New Revision: 1601

Modified:
   branches/samba/no-more-smbfs/debian/rules
Log:
always configure --without-smbmount; smbumount can be a symlink to
umount.cifs and the smbumount/mount.smbfs manpages can also be symlinks,
but mount.smbfs/smbmount needs to be a wrapper in order to translate options.



Modified: branches/samba/no-more-smbfs/debian/rules
===================================================================
--- branches/samba/no-more-smbfs/debian/rules	2007-11-24 09:45:25 UTC (rev 1600)
+++ branches/samba/no-more-smbfs/debian/rules	2007-11-24 10:03:56 UTC (rev 1601)
@@ -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
@@ -148,15 +149,11 @@
 	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
+	# smbfs is deprecated; provide a wrapper that translates any
+	# smbfs mount calls into cifs mount calls
+	ln -s /sbin/umount.cifs $(DESTDIR)/usr/bin/smbumount
+	ln -s umount.cifs.8 $(DESTDIR)/usr/share/man/man8/smbumount.8
+	ln -s mount.cifs.8 $(DESTDIR)/usr/share/man/man8/mount.smbfs.8
 endif
 
 	# For CUPS to support printing to samba printers, it's necessary
@@ -224,14 +221,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