From a843dd79611e5fb5d745a9674be87fe41fe9edec Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski <mt@suse.de>
Date: Fri, 17 Feb 2006 12:45:28 +0000
Subject: [PATCH] - Changed to pass cifs to mount command regardless   if user
 provided smb:// or cifs:// URL.

---
 zypp/media/MediaSMB.cc | 8 ++++----
 zypp/media/MediaSMB.h  | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/zypp/media/MediaSMB.cc b/zypp/media/MediaSMB.cc
index 6e9eb57..6810cc0 100644
--- a/zypp/media/MediaSMB.cc
+++ b/zypp/media/MediaSMB.cc
@@ -97,7 +97,7 @@ namespace zypp {
         : MediaHandler( url_r, attach_point_hint_r,
     		    stripShare( url_r.getPathName() ), // urlpath WITHOUT share name at attachpoint
     		    false )       // does_download
-        , _vfstype( "smbfs" )
+        , _vfstype( "cifs" )
     {
 	MIL << "MediaSMB::MediaSMB(" << url_r << ", " << attach_point_hint_r << ")" << endl;
     }
@@ -111,9 +111,9 @@ namespace zypp {
     //	DESCRIPTION : Asserted that not already attached, and attachPoint
     //      is a directory.
     //
-    //      NOTE: The implementation currently serves both, "smbfs"
-    //      and "cifs". The only difference is the vfstype passed to
-    //      the mount command.
+    //      NOTE: The implementation currently serves both, "smb" and
+    //      and "cifs" URL's, but passes "cifs" to the mount command
+    //      in any case.
     //
     void MediaSMB::attachTo(bool next)
     {
diff --git a/zypp/media/MediaSMB.h b/zypp/media/MediaSMB.h
index 7a5e2fe..5a65d33 100644
--- a/zypp/media/MediaSMB.h
+++ b/zypp/media/MediaSMB.h
@@ -23,9 +23,9 @@ namespace zypp {
     /**
      * @short Implementation class for SMB MediaHandler
      *
-     * NOTE: The implementation currently serves both, "smbfs"
-     * and "cifs". The only difference is the vfstype passed to
-     * the mount command.
+     * NOTE: The implementation currently serves both, "smb"
+     * and "cifs" URL's, but passes "cifs" to the mount command
+     * in any case.
      * @see MediaHandler
      **/
     class MediaSMB : public MediaHandler {
@@ -35,6 +35,7 @@ namespace zypp {
       /**
        * vfstype for mount. This is either "smbfs"
        * or "cifs" (rewritten by MediaCIFS).
+       * Obsolete: vfstype is allways "cifs".
        **/
       const char* _vfstype;
 
-- 
2.7.4