Author: Lars Mueller <lars at samba dot org>
Subject: Use cifs instead of smbfs by default if the source starts with //; minor mount man pages changes (mention cifs and point to mount.cifs man page)
Bugzilla: na
submitted upstream: yes
accepeted upstream: no

Index: util-linux-2.12r/mount/mount.8
===================================================================
--- util-linux-2.12r.orig/mount/mount.8
+++ util-linux-2.12r/mount/mount.8
@@ -367,6 +367,7 @@ currently supported include:
 .IR adfs ,
 .IR affs ,
 .IR autofs ,
+.IR cifs ,
 .IR coda ,
 .IR coherent ,
 .IR cramfs ,
@@ -420,8 +421,8 @@ For most types all the
 program has to do is issue a simple
 .IR mount (2)
 system call, and no detailed knowledge of the filesystem type is required.
-For a few types however (like nfs, smbfs, ncpfs) ad hoc code is
-necessary. The nfs ad hoc code is built in, but smbfs and ncpfs
+For a few types however (like nfs, cifs, smbfs, ncpfs) ad hoc code is
+necessary. The nfs ad hoc code is built in, but cifs, smbfs, and ncpfs
 have a separate mount program. In order to make it possible to
 treat all types in a uniform way, mount will execute the program
 .I /sbin/mount.TYPE
@@ -733,6 +734,11 @@ These options are accepted but ignored.
 (However, quota utilities may react to such strings in
 .IR /etc/fstab .)
 
+.SH "Mount options for cifs"
+See the options section of the
+.BR mount.cifs (8)
+man page (cifs-mount package must be installed).
+
 .SH "Mount options for coherent"
 None.
 
Index: util-linux-2.12r/mount/mount.c
===================================================================
--- util-linux-2.12r.orig/mount/mount.c
+++ util-linux-2.12r/mount/mount.c
@@ -1178,10 +1178,10 @@ mount_one (const char *spec, const char 
 					 "I'll assume nfs because of "
 					 "the colon\n"));
 		} else if(!strncmp(spec, "//", 2)) {
-			types = "smbfs";
+			types = "cifs";
 			if (verbose)
 				printf(_("mount: no type was given - "
-					 "I'll assume smbfs because of "
+					 "I'll assume cifs because of "
 					 "the // prefix\n"));
 		}
 	}