MediaSMB: fix optionname for workgroup; it's 'domain'.
authorMichael Andres <ma@suse.de>
Sat, 31 Oct 2009 15:22:48 +0000 (16:22 +0100)
committerMichael Andres <ma@suse.de>
Sat, 31 Oct 2009 15:22:48 +0000 (16:22 +0100)
zypp/media/MediaManager.h
zypp/media/MediaSMB.cc

index 5142428..dbadab9 100644 (file)
@@ -322,16 +322,16 @@ namespace zypp
      *     - <tt>mountoptions</tt>:
      *       The mount options separated by a comma ','. Default are the
      *       "ro" and "guest" options.
-     *     - <tt>workgroup</tt>:
+     *     - <tt>workgroup</tt> or <tt>domain</tt>:
      *       The name of the workgroup.
      *     - <tt>username</tt>:
      *       Alternative username to username in URL authority.
      *     - <tt>password</tt>:
      *       Alternative password to password in URL authority.
      *     - <tt>user</tt>:
-     *       Alternative username (cifs specific variant?)
+     *       Alternative username (cifs specific variant)
      *     - <tt>pass</tt>:
-     *       Alternative password (cifs specific variant?)
+     *       Alternative password (cifs specific variant)
      *   - Authority:
      *     The authority component has to provide a hostname. Optionally
      *     also a username and password.
index c6577f6..08e4f05 100644 (file)
@@ -183,8 +183,10 @@ namespace zypp {
 
       // look for a workgroup
       string workgroup = _url.getQueryParam("workgroup");
+      if ( workgroup.empty() )
+        workgroup = _url.getQueryParam("domain");
       if ( !workgroup.empty() )
-        options["workgroup"] = workgroup;
+        options["domain"] = workgroup;
 
       // extract 'username', do not overwrite any _url.username