From ff252a47b6f207ca63cacd24fd20bbe1ea0d52b3 Mon Sep 17 00:00:00 2001
From: Michael Andres <ma@suse.de>
Date: Mon, 2 Nov 2009 20:08:00 +0100
Subject: [PATCH] CIFS/SMB: Support mountoption 'noguest' in URL (bnc #547354)

---
 zypp/media/MediaCIFS.cc   | 6 +++++-
 zypp/media/MediaManager.h | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/zypp/media/MediaCIFS.cc b/zypp/media/MediaCIFS.cc
index 7d5215e..bbd9a5e 100644
--- a/zypp/media/MediaCIFS.cc
+++ b/zypp/media/MediaCIFS.cc
@@ -174,7 +174,11 @@ namespace zypp {
       string username = _url.getUsername();
       string password = _url.getPassword();
 
-      options["guest"]; // prevent smbmount from asking for password
+      // Use 'guest' option unless explicitly disabled (bnc #547354)
+      if ( options.has( "noguest" ) )
+        options.erase( "noguest" );
+      else
+        options["guest"];
 
       if ( ! options.has( "rw" ) ) {
         options["ro"];
diff --git a/zypp/media/MediaManager.h b/zypp/media/MediaManager.h
index dbadab9..c0c411e 100644
--- a/zypp/media/MediaManager.h
+++ b/zypp/media/MediaManager.h
@@ -313,6 +313,7 @@ namespace zypp
      *     \code
      *       "cifs://servername/share/path/on/the/share"
      *       "cifs://username:passwd@servername/share/path/on/the/share?mountoptions=ro"
+     *       "cifs://username:passwd@servername/share/path/on/the/share?mountoptions=noguest"
      *       "smb://servername/share/path/on/the/share"
      *       "smb://username:passwd@servername/share/path/on/the/share?mountoptions=ro"
      *     \endcode
@@ -321,7 +322,9 @@ namespace zypp
      *   - Query parameters:
      *     - <tt>mountoptions</tt>:
      *       The mount options separated by a comma ','. Default are the
-     *       "ro" and "guest" options.
+     *       "ro" and "guest" options. Specify "noguest" to turn off
+     *       "guest". This is necessary if Samba is configured to reject
+     *       guest connections.
      *     - <tt>workgroup</tt> or <tt>domain</tt>:
      *       The name of the workgroup.
      *     - <tt>username</tt>:
-- 
2.7.4