ref: refs/heads/ma-misc commit 1f46b966ec29450439d58bca22105c8209242a8b Author: Michael Andres <ma@suse.de> Date: Sat Oct 31 16:22:48 2009 +0100 MediaSMB: fix optionname for workgroup; it's 'domain'. --- zypp/media/MediaManager.h | 6 +++--- zypp/media/MediaSMB.cc | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/zypp/media/MediaManager.h b/zypp/media/MediaManager.h index 5142428..dbadab9 100644 --- a/zypp/media/MediaManager.h +++ b/zypp/media/MediaManager.h @@ -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. diff --git a/zypp/media/MediaSMB.cc b/zypp/media/MediaSMB.cc index c6577f6..08e4f05 100644 --- a/zypp/media/MediaSMB.cc +++ b/zypp/media/MediaSMB.cc @@ -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 -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org