January 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r63175 - /tags/stable-2_20_0/ldap/
by jsuchome＠svn2.opensuse.org 13 Jan '11

13 Jan '11

Author: jsuchome Date: Thu Jan 13 11:50:52 2011 New Revision: 63175 URL: http://svn.opensuse.org/viewcvs/yast?rev=63175&view=rev Log: Created tag stable-2_20_0 for ldap Added: tags/stable-2_20_0/ldap/ - copied from r63174, trunk/ldap/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63174 - in /trunk/ldap: VERSION package/yast2-ldap.changes src/LdapAgent.cc src/LdapAgent.h
by jsuchome＠svn2.opensuse.org 13 Jan '11

13 Jan '11

Author: jsuchome Date: Thu Jan 13 11:50:42 2011 New Revision: 63174 URL: http://svn.opensuse.org/viewcvs/yast?rev=63174&view=rev Log: - added support for setting TLS options - 2.20.0 Modified: trunk/ldap/VERSION trunk/ldap/package/yast2-ldap.changes trunk/ldap/src/LdapAgent.cc trunk/ldap/src/LdapAgent.h Modified: trunk/ldap/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap/VERSION?rev=63174&r1=63173&… ============================================================================== --- trunk/ldap/VERSION (original) +++ trunk/ldap/VERSION Thu Jan 13 11:50:42 2011 @@ -1 +1 @@ -2.17.3 +2.20.0 Modified: trunk/ldap/package/yast2-ldap.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap/package/yast2-ldap.changes?… ============================================================================== --- trunk/ldap/package/yast2-ldap.changes (original) +++ trunk/ldap/package/yast2-ldap.changes Thu Jan 13 11:50:42 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 13 09:33:46 CET 2011 - jsuchome(a)suse.cz + +- added support for setting TLS options +- 2.20.0 + +------------------------------------------------------------------- Thu Jun 18 15:07:37 CEST 2009 - mvidner(a)suse.cz - Using autodocs-cc.ami, which contains a fix for automake 1.11. Modified: trunk/ldap/src/LdapAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap/src/LdapAgent.cc?rev=63174&… ============================================================================== --- trunk/ldap/src/LdapAgent.cc (original) +++ trunk/ldap/src/LdapAgent.cc Thu Jan 13 11:50:42 2011 @@ -500,6 +500,33 @@ } /** + * Adapt TLS Settings of existing LDAP connection + * args is argument map got from YCP call + * tls is string, values are "yes" and "try" + */ +void LdapAgent::set_tls_options (YCPMap args, string set_tls) +{ + string cacertfile = getValue (args, "cacertfile"); + string cacertdir = getValue (args, "cacertdir"); + + TlsOptions tls = ldap->getTlsOptions(); + if (cacertfile != "") { + tls.setOption (TlsOptions::CACERTFILE, cacertfile); + } + if (cacertdir != "") { + tls.setOption (TlsOptions::CACERTDIR, cacertdir); + } + + if (set_tls == "yes") { + tls.setOption (TlsOptions::REQUIRE_CERT, TlsOptions::DEMAND); + } + if (set_tls == "try") { + tls.setOption (TlsOptions::REQUIRE_CERT, TlsOptions::TRY); + } +} + + +/** * Dir */ YCPList LdapAgent::Dir(const YCPPath& path) @@ -1248,6 +1275,7 @@ // start TLS if proper parameter is given string tls = getValue (argmap, "use_tls"); + set_tls_options (argmap, tls); if (tls == "try" || tls == "yes") { try { @@ -1436,6 +1464,7 @@ } else if (PC(0) == "start_tls") { + set_tls_options (argmap, "yes"); try { ldap->start_tls (); } @@ -1446,6 +1475,7 @@ } return YCPBoolean(true); } + else { y2error("Wrong path '%s' in Execute().", path->toString().c_str()); } Modified: trunk/ldap/src/LdapAgent.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap/src/LdapAgent.h?rev=63174&r… ============================================================================== --- trunk/ldap/src/LdapAgent.h (original) +++ trunk/ldap/src/LdapAgent.h Thu Jan 13 11:50:42 2011 @@ -157,6 +157,11 @@ void debug_referral (LDAPReferralException e, string action); /** + * Adapt TLS Settings of existing LDAP connection + */ + void set_tls_options (YCPMap args, string tls); + + /** * creates attributes for new LDAP object and fills their values */ void generate_attr_list (LDAPAttributeList* attrs, YCPMap map); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63173 - /trunk/ldap-client/src/ui.ycp
by jsuchome＠svn2.opensuse.org 12 Jan '11

12 Jan '11

Author: jsuchome Date: Wed Jan 12 16:57:26 2011 New Revision: 63173 URL: http://svn.opensuse.org/viewcvs/yast?rev=63173&view=rev Log: do not alow to turn off TLS when SSSD is used Modified: trunk/ldap-client/src/ui.ycp Modified: trunk/ldap-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ui.ycp?rev=63173… ============================================================================== --- trunk/ldap-client/src/ui.ycp (original) +++ trunk/ldap-client/src/ui.ycp Wed Jan 12 16:57:26 2011 @@ -332,6 +332,8 @@ UI::ChangeWidget (`id(`server),`ValidChars, Address::ValidChars + " "); UI::ChangeWidget (`id(`import_cert),`Enabled, ldap_tls); UI::ChangeWidget (`id(`sssd_cache_credentials),`Enabled, Ldap::sssd); + // do not alow to turn off TLS when SSSD is used + UI::ChangeWidget (`id (`ldaps), `Enabled, !Ldap::sssd); symbol result = `not_next; do { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63172 - /branches/SuSE-SLE-10-SP3-Branch/samba-server/src/SambaServer.pm
by locilka＠svn2.opensuse.org 12 Jan '11

12 Jan '11

Author: locilka Date: Wed Jan 12 15:39:26 2011 New Revision: 63172 URL: http://svn.opensuse.org/viewcvs/yast?rev=63172&view=rev Log: Non-GPLv3 packages are preferred, not vice versa Modified: branches/SuSE-SLE-10-SP3-Branch/samba-server/src/SambaServer.pm Modified: branches/SuSE-SLE-10-SP3-Branch/samba-server/src/SambaServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/samba-… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/samba-server/src/SambaServer.pm (original) +++ branches/SuSE-SLE-10-SP3-Branch/samba-server/src/SambaServer.pm Wed Jan 12 15:39:26 2011 @@ -84,8 +84,8 @@ sub CheckAndInstallPackages { # Check whether samba is installed as 'samba' or 'samba-gplv3' and install the rest of packages # GPLv3 packages are preferred - PackageSystem->InstalledAny($RequiredPackages) && PackageSystem->CheckAndInstallPackagesInteractive($RequiredPackages) || - PackageSystem->CheckAndInstallPackagesInteractive($RequiredPackages_gplv3) || + PackageSystem->InstalledAny($RequiredPackages_gplv3) && PackageSystem->CheckAndInstallPackagesInteractive($RequiredPackages_gplv3) || + PackageSystem->CheckAndInstallPackagesInteractive($RequiredPackages) || return 0; return 1; @@ -394,11 +394,11 @@ my ($self) = @_; # Check whether any 'samba' is installed and keep it - if (PackageSystem->InstalledAny($RequiredPackages)) { + if (PackageSystem->InstalledAny($RequiredPackages_gplv3)) { return { install => $RequiredPackages, remove => []}; # If any other samba (GPLv3) or none is installed, prefer the GPLv3 } else { - return { install => $RequiredPackages_gplv3, remove => []}; + return { install => $RequiredPackages, remove => []}; } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63171 - /branches/SuSE-SLE-10-SP3-Branch/samba-server/src/SambaServer.pm
by locilka＠svn2.opensuse.org 12 Jan '11

12 Jan '11

Author: locilka Date: Wed Jan 12 15:07:19 2011 New Revision: 63171 URL: http://svn.opensuse.org/viewcvs/yast?rev=63171&view=rev Log: Oops this is Perl :) Modified: branches/SuSE-SLE-10-SP3-Branch/samba-server/src/SambaServer.pm Modified: branches/SuSE-SLE-10-SP3-Branch/samba-server/src/SambaServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/samba-… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/samba-server/src/SambaServer.pm (original) +++ branches/SuSE-SLE-10-SP3-Branch/samba-server/src/SambaServer.pm Wed Jan 12 15:07:19 2011 @@ -394,7 +394,7 @@ my ($self) = @_; # Check whether any 'samba' is installed and keep it - if PackageSystem->InstalledAny($RequiredPackages) { + if (PackageSystem->InstalledAny($RequiredPackages)) { return { install => $RequiredPackages, remove => []}; # If any other samba (GPLv3) or none is installed, prefer the GPLv3 } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63170 - /tags/branch-SLE-10-SP3-2_13_27/samba-server/
by locilka＠svn2.opensuse.org 12 Jan '11

12 Jan '11

Author: locilka Date: Wed Jan 12 15:05:37 2011 New Revision: 63170 URL: http://svn.opensuse.org/viewcvs/yast?rev=63170&view=rev Log: Created tag branch-SLE-10-SP3-2_13_27 for samba-server Added: tags/branch-SLE-10-SP3-2_13_27/samba-server/ - copied from r63169, branches/SuSE-SLE-10-SP3-Branch/samba-server/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63169 - in /branches/SuSE-SLE-10-SP3-Branch/samba-server: VERSION package/yast2-samba-server.changes src/SambaServer.pm
by locilka＠svn2.opensuse.org 12 Jan '11

12 Jan '11

Author: locilka Date: Wed Jan 12 15:05:25 2011 New Revision: 63169 URL: http://svn.opensuse.org/viewcvs/yast?rev=63169&view=rev Log: Added AutoYaST support for samba-gplv3 packages (BNC #657414) Modified: branches/SuSE-SLE-10-SP3-Branch/samba-server/VERSION branches/SuSE-SLE-10-SP3-Branch/samba-server/package/yast2-samba-server.changes branches/SuSE-SLE-10-SP3-Branch/samba-server/src/SambaServer.pm Modified: branches/SuSE-SLE-10-SP3-Branch/samba-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/samba-… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/samba-server/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/samba-server/VERSION Wed Jan 12 15:05:25 2011 @@ -1 +1 @@ -2.13.26 +2.13.27 Modified: branches/SuSE-SLE-10-SP3-Branch/samba-server/package/yast2-samba-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/samba-… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/samba-server/package/yast2-samba-server.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/samba-server/package/yast2-samba-server.changes Wed Jan 12 15:05:25 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 12 14:58:18 CET 2011 - locilka(a)suse.cz + +- Added AutoYaST support for samba-gplv3 packages (BNC #657414) +- 2.13.27 + +------------------------------------------------------------------- Wed Jan 5 14:26:04 CET 2011 - locilka(a)suse.cz - Import sets Modified to true (BNC #572670). Modified: branches/SuSE-SLE-10-SP3-Branch/samba-server/src/SambaServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/samba-… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/samba-server/src/SambaServer.pm (original) +++ branches/SuSE-SLE-10-SP3-Branch/samba-server/src/SambaServer.pm Wed Jan 12 15:05:25 2011 @@ -82,12 +82,13 @@ # Check that packages are installed or offer their installation BEGIN{ $TYPEINFO{GetModified} = ["function", "boolean"] } sub CheckAndInstallPackages { - # installed_required_packages? or installed_packages_gplv3? or install_packages! - PackageSystem->InstalledAll($RequiredPackages) || - PackageSystem->InstalledAll($RequiredPackages_gplv3) || - PackageSystem->CheckAndInstallPackagesInteractive($RequiredPackages) || - return 0; - return 1; + # Check whether samba is installed as 'samba' or 'samba-gplv3' and install the rest of packages + # GPLv3 packages are preferred + PackageSystem->InstalledAny($RequiredPackages) && PackageSystem->CheckAndInstallPackagesInteractive($RequiredPackages) || + PackageSystem->CheckAndInstallPackagesInteractive($RequiredPackages_gplv3) || + return 0; + + return 1; } # Read all samba-server settings @@ -391,7 +392,14 @@ BEGIN{$TYPEINFO{AutoPackages}=["function",["map","string",["list","string"]]]} sub AutoPackages { my ($self) = @_; - return { install=> $RequiredPackages, remove => []}; + + # Check whether any 'samba' is installed and keep it + if PackageSystem->InstalledAny($RequiredPackages) { + return { install => $RequiredPackages, remove => []}; + # If any other samba (GPLv3) or none is installed, prefer the GPLv3 + } else { + return { install => $RequiredPackages_gplv3, remove => []}; + } } 8; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63168 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes src/YQLogView.cc src/YQLogView.h
by tgoettlicher＠svn2.opensuse.org 12 Jan '11

12 Jan '11

Author: tgoettlicher Date: Wed Jan 12 15:02:38 2011 New Revision: 63168 URL: http://svn.opensuse.org/viewcvs/yast?rev=63168&view=rev Log: - Fixed LogView's scroller - V 2.19.6 Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/src/YQLogView.cc trunk/qt/src/YQLogView.h Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=63168&r1=63… ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Wed Jan 12 15:02:38 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "19") -SET(VERSION_PATCH "5") +SET(VERSION_PATCH "6") Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Wed Jan 12 15:02:38 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 12 15:01:20 CET 2011 - tgoettlicher(a)suse.de + +- Fixed LogView's scroller +- V 2.19.6 + +------------------------------------------------------------------- Mon Dec 20 16:52:53 CET 2010 - tgoettlicher(a)suse.de - Added support for check boxes in tree widgets Modified: trunk/qt/src/YQLogView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQLogView.cc?rev=63168&r1… ============================================================================== --- trunk/qt/src/YQLogView.cc (original) +++ trunk/qt/src/YQLogView.cc Wed Jan 12 15:02:38 2011 @@ -94,14 +94,21 @@ { QScrollBar *sb = _qt_text->verticalScrollBar(); - int sbVal = sb->value(); - int sbMaxVal = sb->maximum(); - _qt_text->setPlainText( fromUTF8( text ) ); - - if ( sbVal != sbMaxVal ) - sb->setValue( sbVal ); - else - sb->setValue( sb->maximum() ); + QString newString = fromUTF8( text ); + + bool atEnd = sb->value() == sb->maximum(); + + if (newString.startsWith(_lastText)) { + _qt_text->append(newString.mid(_lastText.length() + 1 )); + } else { + _qt_text->setPlainText( newString ); + } + + if (atEnd) { + _qt_text->moveCursor( QTextCursor::End ); + _qt_text->ensureCursorVisible(); + } + _lastText = newString; } Modified: trunk/qt/src/YQLogView.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQLogView.h?rev=63168&r1=… ============================================================================== --- trunk/qt/src/YQLogView.h (original) +++ trunk/qt/src/YQLogView.h Wed Jan 12 15:02:38 2011 @@ -126,6 +126,7 @@ YQWidgetCaption * _caption; QTextEdit * _qt_text; + QString _lastText; }; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63167 - /tags/stable-2_20_5/ldap-client/
by jsuchome＠svn2.opensuse.org 12 Jan '11

12 Jan '11

Author: jsuchome Date: Wed Jan 12 13:19:32 2011 New Revision: 63167 URL: http://svn.opensuse.org/viewcvs/yast?rev=63167&view=rev Log: Created tag stable-2_20_5 for ldap-client Added: tags/stable-2_20_5/ldap-client/ - copied from r63166, trunk/ldap-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63166 - in /trunk/ldap-client: VERSION package/yast2-ldap-client.changes src/Ldap.ycp testsuite/tests/Export.out testsuite/tests/Export.ycp testsuite/tests/Read.out testsuite/tests/Read.ycp
by jsuchome＠svn2.opensuse.org 12 Jan '11

12 Jan '11

Author: jsuchome Date: Wed Jan 12 13:19:05 2011 New Revision: 63166 URL: http://svn.opensuse.org/viewcvs/yast?rev=63166&view=rev Log: - write uri instead of just host name to ldap.conf and sssd.conf (bnc#663012) - 2.20.5 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/Ldap.ycp trunk/ldap-client/testsuite/tests/Export.out trunk/ldap-client/testsuite/tests/Export.ycp trunk/ldap-client/testsuite/tests/Read.out trunk/ldap-client/testsuite/tests/Read.ycp Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=63166&r1… ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Wed Jan 12 13:19:05 2011 @@ -1 +1 @@ -2.20.4 +2.20.5 Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-c… ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Wed Jan 12 13:19:05 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jan 12 12:58:31 CET 2011 - jsuchome(a)suse.cz + +- write uri instead of just host name to ldap.conf and sssd.conf + (bnc#663012) +- 2.20.5 + +------------------------------------------------------------------- Fri Jan 7 12:11:38 CET 2011 - jsuchome(a)suse.cz - call c_rehash after downloading certificate (bnc#662937) Modified: trunk/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?rev=631… ============================================================================== --- trunk/ldap-client/src/Ldap.ycp (original) +++ trunk/ldap-client/src/Ldap.ycp Wed Jan 12 13:19:05 2011 @@ -32,6 +32,7 @@ import "Stage"; import "String"; import "Summary"; + import "URL"; /** * show popups with error messages? @@ -643,6 +644,35 @@ return oes; } + // convert list of uri's to list of hosts + string uri2servers (string uri) { + return mergestring (maplist (string u, splitstring (uri, " \t"), { + map url = URL::Parse (u); + string h = url["host"]:""; + if (url["port"]:"" != "") + h = sformat ("%1:%2", h, url["port"]:""); + return h; + }), " "); + } + + /** + * Read values of LDAP hosts from ldap.conf + * get them from 'uri' or 'host' values + */ + global string ReadLdapHosts () { + string ret = ""; + string uri = ReadLdapConfEntry ("uri", ""); + if (uri == "") + { + ret = ReadLdapConfEntry ("host", ""); + } + else + { + ret = uri2servers (uri); + } + return ret; + } + /** * Reads LDAP settings from the SCR * @return success @@ -689,7 +719,8 @@ size (nsswitch["passwd_compat"]:[]) == 0)); nis_available = nis_available && (Service::Status ("ypbind") == 0); - server = ReadLdapConfEntry ("host", ""); + server = ReadLdapHosts (); + base_dn = ReadLdapConfEntry ("base", ""); old_base_dn = base_dn; @@ -975,7 +1006,7 @@ if (bind_pass == nil && servers == "") { y2milestone ("--- server not read yet or empty, reading now"); - servers = ReadLdapConfEntry ("host", ""); + servers = ReadLdapHosts (); } list l_servers = splitstring (servers, " \t"); @@ -989,7 +1020,7 @@ if (bind_pass == nil && servers == "") { y2milestone ("--- server not read yet or empty, reading now"); - servers = ReadLdapConfEntry ("host", ""); + servers = ReadLdapHosts (); } list l_servers = splitstring (servers, " \t"); @@ -1908,8 +1939,23 @@ map out = (map)SCR::Execute(.target.bash_output, "/bin/rpm -V openldap2-client"); - list open_host = (list) SCR::Read - (.etc.ldap_conf.v."/etc/openldap/ldap.conf".host); + list open_host = []; + list open_uri = (list) SCR::Read + (.etc.ldap_conf.v."/etc/openldap/ldap.conf".uri); + if (open_uri == []) + { + open_uri = (list) SCR::Read + (.etc.ldap_conf.v."/etc/openldap/ldap.conf".URI); + } + if (open_uri == []) + { + open_host = (list) SCR::Read + (.etc.ldap_conf.v."/etc/openldap/ldap.conf".host); + } + else + { + open_host = [ uri2servers (open_uri[0]:"")]; + } list open_base = (list) SCR::Read (.etc.ldap_conf.v."/etc/openldap/ldap.conf".base); @@ -1925,8 +1971,16 @@ if (write_openldap_conf) { // update ldap.conf - SCR::Write (.etc.ldap_conf.v."/etc/openldap/ldap.conf".host, - [server]); + SCR::Write (.etc.ldap_conf.v."/etc/openldap/ldap.conf".host, nil); + + string uri = mergestring ( + maplist (string u, splitstring (server, " \t"), { + return "ldap://" + u; + }), " "); + + SCR::Write (.etc.ldap_conf.v."/etc/openldap/ldap.conf".uri, + [uri]); + SCR::Write(.etc.ldap_conf.v."/etc/openldap/ldap.conf".base, [base_dn]); @@ -1970,7 +2024,7 @@ path domain = add (.etc.sssd_conf.v, "domain/default"); - string uri = sformat ("ldap%1://%2", ldap_tls ? "s" : "", String::FirstChunk (server, " \t")); + string uri = sformat ("ldap://%1", String::FirstChunk (server, " \t")); SCR::Write (add (domain, "ldap_uri"), uri); SCR::Write (add (domain, "ldap_search_base"), base_dn); SCR::Write (add (domain, "ldap_schema"), "rfc2307bis"); @@ -2433,7 +2487,12 @@ if (modified) { // update ldap.conf - WriteLdapConfEntry ("host", server); + WriteLdapConfEntry ("host", nil); + string uri = mergestring ( + maplist (string u, splitstring (server, " \t"), { + return "ldap://" + u; + }), " "); + WriteLdapConfEntry ("uri", uri); WriteLdapConfEntry ("base", base_dn); if (member_attribute != old_member_attribute) Modified: trunk/ldap-client/testsuite/tests/Export.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/Expo… ============================================================================== --- trunk/ldap-client/testsuite/tests/Export.out (original) +++ trunk/ldap-client/testsuite/tests/Export.out Wed Jan 12 13:19:05 2011 @@ -1,4 +1,5 @@ Dump ==== reading... ============================ +Read .etc.ldap_conf.v."/etc/ldap.conf"."uri" nil Read .etc.ldap_conf.v."/etc/ldap.conf"."host" "localhost" Read .etc.ldap_conf.v."/etc/ldap.conf"."base" "dc=suse,dc=cz" Read .etc.ldap_conf.v."/etc/ldap.conf"."ldap_version" nil Modified: trunk/ldap-client/testsuite/tests/Export.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/Expo… ============================================================================== --- trunk/ldap-client/testsuite/tests/Export.ycp (original) +++ trunk/ldap-client/testsuite/tests/Export.ycp Wed Jan 12 13:19:05 2011 @@ -31,7 +31,8 @@ "pam_password": "crypt", "tls_cacertdir" : "/etc/openldap/cacerts/", "tls_cacertfile": nil, - "tls_checkpeer" : nil + "tls_checkpeer" : nil, + "uri" : nil ] ] ], Modified: trunk/ldap-client/testsuite/tests/Read.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/Read… ============================================================================== --- trunk/ldap-client/testsuite/tests/Read.out (original) +++ trunk/ldap-client/testsuite/tests/Read.out Wed Jan 12 13:19:05 2011 @@ -1,5 +1,5 @@ Dump ==== reading... ============================ -Read .etc.ldap_conf.v."/etc/ldap.conf"."host" "localhost" +Read .etc.ldap_conf.v."/etc/ldap.conf"."uri" "ldap://localhost:333" Read .etc.ldap_conf.v."/etc/ldap.conf"."base" "dc=suse,dc=cz" Read .etc.ldap_conf.v."/etc/ldap.conf"."ldap_version" nil Read .etc.ldap_conf.v."/etc/ldap.conf"."ssl" nil @@ -22,3 +22,4 @@ Dump nsswitch: -$["group":["compat"], "group_compat":["ldap"], "passwd":["compat"], "passwd_compat":["ldap"]]- Dump base config DN: -- Dump bind DN: -uid=manager,dc=suse,dc=cz- +Dump server: -localhost:333- Modified: trunk/ldap-client/testsuite/tests/Read.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/Read… ============================================================================== --- trunk/ldap-client/testsuite/tests/Read.ycp (original) +++ trunk/ldap-client/testsuite/tests/Read.ycp Wed Jan 12 13:19:05 2011 @@ -31,7 +31,8 @@ "pam_password": "crypt", "tls_cacertdir" : "/etc/openldap/cacerts/", "tls_cacertfile": nil, - "tls_checkpeer" : "no" + "tls_checkpeer" : "no", + "uri" : "ldap://localhost:333" ] ] ], @@ -102,4 +103,6 @@ DUMP ( sformat ("base config DN: -%1-", Ldap::base_config_dn) ); DUMP ( sformat ("bind DN: -%1-", Ldap::bind_dn) ); + + DUMP ( sformat ("server: -%1-", Ldap::server) ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0