- YaST Commits

[yast-commit] r38102 - /branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/doc/autodocs/
by fehr＠svn.opensuse.org 23 May '07

23 May '07

Author: fehr Date: Wed May 23 12:58:16 2007 New Revision: 38102 URL: http://svn.opensuse.org/viewcvs/yast?rev=38102&view=rev Log: executed propset Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/doc/autodocs/ (props changed) -- 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] r38101 - /branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/doc/autodocs/.cvsignore
by fehr＠svn.opensuse.org 23 May '07

23 May '07

Author: fehr Date: Wed May 23 12:55:17 2007 New Revision: 38101 URL: http://svn.opensuse.org/viewcvs/yast?rev=38101&view=rev Log: update .cvsignore Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/doc/autodocs/.cvsignore Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/doc/autodocs/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/doc/autodocs/.cvsignore (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/doc/autodocs/.cvsignore Wed May 23 12:55:17 2007 @@ -7,3 +7,5 @@ doxygen.log doxygen.conf installdox +tab_?.gif +tabs.css -- 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] r38100 - /tags/branch-SLE-10-SP1-2_13_67/ncurses/
by gs＠svn.opensuse.org 23 May '07

23 May '07

Author: gs Date: Wed May 23 12:03:44 2007 New Revision: 38100 URL: http://svn.opensuse.org/viewcvs/yast?rev=38100&view=rev Log: Created tag branch-SLE-10-SP1-2_13_67 for ncurses Added: tags/branch-SLE-10-SP1-2_13_67/ncurses/ - copied from r38099, branches/SuSE-SLE-10-SP1-Branch/ncurses/ -- 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] r38099 - in /branches/SuSE-SLE-10-SP1-Branch/ncurses: VERSION package/yast2-ncurses.changes src/NCPopupDiskspace.cc
by gs＠svn.opensuse.org 23 May '07

23 May '07

Author: gs Date: Wed May 23 12:03:18 2007 New Revision: 38099 URL: http://svn.opensuse.org/viewcvs/yast?rev=38099&view=rev Log: check whether partition size is zero (bug #270836) Modified: branches/SuSE-SLE-10-SP1-Branch/ncurses/VERSION branches/SuSE-SLE-10-SP1-Branch/ncurses/package/yast2-ncurses.changes branches/SuSE-SLE-10-SP1-Branch/ncurses/src/NCPopupDiskspace.cc Modified: branches/SuSE-SLE-10-SP1-Branch/ncurses/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/ncurse… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/ncurses/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/ncurses/VERSION Wed May 23 12:03:18 2007 @@ -1 +1 @@ -2.13.66 +2.13.67 Modified: branches/SuSE-SLE-10-SP1-Branch/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/ncurse… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/ncurses/package/yast2-ncurses.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/ncurses/package/yast2-ncurses.changes Wed May 23 12:03:18 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed May 23 11:40:29 CEST 2007 - gs(a)suse.de + +- Package Installation: check the partition size to prevent + division by zero during disk space calculation (bug #270836) +- 2.13.67 + +------------------------------------------------------------------- Tue Mar 6 09:59:22 CET 2007 - kmachalkova(a)suse.cz - initscr() code is back - needed for running yast clients from Modified: branches/SuSE-SLE-10-SP1-Branch/ncurses/src/NCPopupDiskspace.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/ncurse… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/ncurses/src/NCPopupDiskspace.cc (original) +++ branches/SuSE-SLE-10-SP1-Branch/ncurses/src/NCPopupDiskspace.cc Wed May 23 12:03:18 2007 @@ -236,8 +236,12 @@ { FSize usedSize ( partition.pkg_size, FSize::K ); FSize totalSize ( partition.total_size, FSize::K ); - - int percent = ( 100 * usedSize ) / totalSize; + + int percent = 0; + + if ( totalSize != 0 ) + percent = ( 100 * usedSize ) / totalSize; + int free = ( totalSize - usedSize ) / FSize::MB; NCMIL << "Partition: " << partition.dir << " Used percent: " @@ -293,6 +297,8 @@ // void NCPopupDiskspace::setDiskSpace( wint_t ch ) { + int percent = 0; + // set diskspace values in ZyppDuSet testDiskSpace for ( ZyppDuSetIterator it = testDiskUsage.begin(); it != testDiskUsage.end(); @@ -302,7 +308,9 @@ FSize usedSize ( partitionDu.pkg_size, FSize::K ); FSize totalSize ( partitionDu.total_size, FSize::K ); - int percent = ( 100 * usedSize ) / totalSize; + + if ( totalSize != 0 ) + percent = ( 100 * usedSize ) / totalSize; if ( ch == '+' ) percent += 3; -- 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] r38098 - /tags/stable-2_15_2/bluetooth/
by lslezak＠svn.opensuse.org 23 May '07

23 May '07

Author: lslezak Date: Wed May 23 10:55:23 2007 New Revision: 38098 URL: http://svn.opensuse.org/viewcvs/yast?rev=38098&view=rev Log: Created tag stable-2_15_2 for bluetooth Added: tags/stable-2_15_2/bluetooth/ - copied from r38097, trunk/bluetooth/ -- 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] r38097 - in /trunk/bluetooth: VERSION package/yast2-bluetooth.changes src/Bluetooth.ycp
by lslezak＠svn.opensuse.org 23 May '07

23 May '07

Author: lslezak Date: Wed May 23 10:54:42 2007 New Revision: 38097 URL: http://svn.opensuse.org/viewcvs/yast?rev=38097&view=rev Log: - fix for bluez >= 3.10 (SDP daemon is now included in HCID daemon) (#276650) - 2.15.2 Modified: trunk/bluetooth/VERSION trunk/bluetooth/package/yast2-bluetooth.changes trunk/bluetooth/src/Bluetooth.ycp Modified: trunk/bluetooth/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bluetooth/VERSION?rev=38097&r1=3… ============================================================================== --- trunk/bluetooth/VERSION (original) +++ trunk/bluetooth/VERSION Wed May 23 10:54:42 2007 @@ -1 +1 @@ -2.15.1 +2.15.2 Modified: trunk/bluetooth/package/yast2-bluetooth.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bluetooth/package/yast2-bluetoot… ============================================================================== --- trunk/bluetooth/package/yast2-bluetooth.changes (original) +++ trunk/bluetooth/package/yast2-bluetooth.changes Wed May 23 10:54:42 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed May 23 10:26:31 CEST 2007 - lslezak(a)suse.cz + +- fix for bluez >= 3.10 (SDP daemon is now included in HCID daemon) + (#276650) +- 2.15.2 + +------------------------------------------------------------------- Thu Mar 1 15:08:05 CET 2007 - lslezak(a)suse.cz - fixed a rich text tag in the help text (#249490) Modified: trunk/bluetooth/src/Bluetooth.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bluetooth/src/Bluetooth.ycp?rev=… ============================================================================== --- trunk/bluetooth/src/Bluetooth.ycp (original) +++ trunk/bluetooth/src/Bluetooth.ycp Wed May 23 10:54:42 2007 @@ -106,6 +106,11 @@ if (all != nil && size(all) > 0) { foreach(string var, all, ``{ + // the SDP_START variable might be lying around from < bluez-3.10 + // ignore it. + if (var == "SDP_START") { + continue; + } if (regexpmatch(var, ".*_START$")) { string daemon_name = regexpsub(var, "(.*)_START$", "\\1"); @@ -114,6 +119,8 @@ } ); } + // SDP is always there, but built into hcid since bluez-3.10 + ret = add(ret, "SDP"); return ret; } @@ -154,6 +161,10 @@ // reset daemon list daemons = []; foreach(string service, detected_services, ``{ + if ((service == "SDP" )) + { + continue; + } // read start status boolean service_enabled = (SCR::Read(.sysconfig.bluetooth + (service + "_START")) == "yes"); @@ -163,6 +174,17 @@ // read daemon arguments string args = (string)SCR::Read(.sysconfig.bluetooth + (service + "_DAEMON_ARGS")); + if ((service == "HCI")) + { + boolean sdp_enabled = false; + if (regexpmatch(args, "([ \t]|^)-s([ \t]|$)")) + { + sdp_enabled = true; + } + daemons = add(daemons, $[ "service" : "SDP", "enabled": sdp_enabled, + "daemon" : "", "args" : "" ]); + } + daemons = add(daemons, $[ "service" : service, "enabled" : service_enabled, "daemon" : binary, "args" : args ]); } @@ -259,7 +281,31 @@ SCR::Write(.sysconfig.bluetooth.START_SERVICES, (enabled) ? "yes" : "no"); // write daemon settings + boolean sdp_enabled = false; foreach(map<string,any> d, daemons, ``{ + if ((d["service"]:"") == "SDP") + { + sdp_enabled = (d["enabled"]:false); + } + } + ); + foreach(map<string,any> d, daemons, ``{ + if ((d["service"]:"") == "SDP") + { + // SDPD is now handled by passing "-s" to hcid, since bluez-3.10 + continue; + } + else if ((d["service"]:"") == "HCI") + { + if (regexpmatch(d["args"]:"", "([ \t]|^)-s([ \t]|$)")) + { + d["args"] = regexpsub(d["args"]:"", "(.*)([ \t]|^)-s([ \t]|$)(.*)", "\\1 \\4"); + } + if (sdp_enabled) + { + d["args"] = "-s " + (d["args"]:""); + } + } SCR::Write(.sysconfig.bluetooth + ((d["service"]:"") + "_START"), d["enabled"]:false ? "yes" : "no"); SCR::Write(.sysconfig.bluetooth + ((d["service"]:"") + "_DAEMON_ARGS"), d["args"]:""); } -- 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] r38096 - /tags/stable-2_15_27/users/
by jsuchome＠svn.opensuse.org 23 May '07

23 May '07

Author: jsuchome Date: Wed May 23 10:06:47 2007 New Revision: 38096 URL: http://svn.opensuse.org/viewcvs/yast?rev=38096&view=rev Log: Created tag stable-2_15_27 for users Added: tags/stable-2_15_27/users/ - copied from r38095, trunk/users/ -- 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] r38095 - /tags/stable-2_15_8/ldap-client/
by jsuchome＠svn.opensuse.org 23 May '07

23 May '07

Author: jsuchome Date: Wed May 23 10:06:36 2007 New Revision: 38095 URL: http://svn.opensuse.org/viewcvs/yast?rev=38095&view=rev Log: Created tag stable-2_15_8 for ldap-client Added: tags/stable-2_15_8/ldap-client/ - copied from r38094, 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] r38094 - in /trunk/users: VERSION package/yast2-users.changes src/UsersLDAP.pm yast2-users.spec.in
by jsuchome＠svn.opensuse.org 23 May '07

23 May '07

Author: jsuchome Date: Wed May 23 10:06:34 2007 New Revision: 38094 URL: http://svn.opensuse.org/viewcvs/yast?rev=38094&view=rev Log: - use LDAPInitWithTLSCheck function for init - offer fallback to unencrypted connection (#246397) - 2.15.27 Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/src/UsersLDAP.pm trunk/users/yast2-users.spec.in Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=38094&r1=38093… ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Wed May 23 10:06:34 2007 @@ -1 +1 @@ -2.15.26 +2.15.27 Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.change… ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Wed May 23 10:06:34 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed May 23 09:55:46 CEST 2007 - jsuchome(a)suse.cz + +- use LDAPInitWithTLSCheck function for init - offer fallback to + unencrypted connection (#246397) +- 2.15.27 + +------------------------------------------------------------------- Fri May 11 13:23:21 CEST 2007 - jsuchome(a)suse.cz - during autoinstallation, do not touch already created directories Modified: trunk/users/src/UsersLDAP.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersLDAP.pm?rev=38094… ============================================================================== --- trunk/users/src/UsersLDAP.pm (original) +++ trunk/users/src/UsersLDAP.pm Wed May 23 10:06:34 2007 @@ -206,7 +206,7 @@ } Ldap->SetGUI ($use_gui); - my $ldap_mesg = Ldap->LDAPInit (); + my $ldap_mesg = Ldap->LDAPInitWithTLSCheck ({}); if ($ldap_mesg ne "") { Ldap->LDAPErrorMessage ("init", $ldap_mesg); return $ldap_mesg; Modified: trunk/users/yast2-users.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/yast2-users.spec.in?rev=38… ============================================================================== --- trunk/users/yast2-users.spec.in (original) +++ trunk/users/yast2-users.spec.in Wed May 23 10:06:34 2007 @@ -3,11 +3,13 @@ @HEADER@ BuildRequires: cracklib-devel doxygen gcc-c++ perl-Digest-SHA1 perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-ldap-client yast2-perl-bindings yast2-security yast2-testsuite yast2-core-devel -Requires: yast2 yast2-perl-bindings yast2-country yast2-pam yast2-security cracklib perl-Digest-SHA1 perl-X500-DN perl-gettext yast2-ldap-client +Requires: yast2 yast2-perl-bindings yast2-country yast2-pam yast2-security cracklib perl-Digest-SHA1 perl-X500-DN perl-gettext Obsoletes: yast2-config-users y2c_users yast2-trans-users y2t_users yast2-trans-inst-user yast2-trans-users y2t_inst-user Provides: yast2-config-users y2c_users yast2-trans-users y2t_users yast2-trans-inst-user yast2-trans-users y2t_inst-user -#BuildArchitectures: noarch +# LDAPInitWithTLSCheck +Requires: yast2-ldap-client >= 2.15.8 + Summary: Configuration of users -- 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] r38093 - in /trunk/ldap-client: VERSION package/yast2-ldap-client.changes src/Ldap.ycp src/LdapPopup.ycp src/ldap_browser.ycp
by jsuchome＠svn.opensuse.org 23 May '07

23 May '07

Author: jsuchome Date: Wed May 23 10:06:23 2007 New Revision: 38093 URL: http://svn.opensuse.org/viewcvs/yast?rev=38093&view=rev Log: - added LDAPInitWithTLSCheck function to offer fallback to uncrypted connection when start_tls method failed (#246397) - save changed settings even if PAM is not set (#248181) - 2.15.8 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/Ldap.ycp trunk/ldap-client/src/LdapPopup.ycp trunk/ldap-client/src/ldap_browser.ycp Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=38093&r1… ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Wed May 23 10:06:23 2007 @@ -1 +1 @@ -2.15.7 +2.15.8 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 May 23 10:06:23 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed May 23 09:50:50 CEST 2007 - jsuchome(a)suse.cz + +- added LDAPInitWithTLSCheck function to offer fallback to uncrypted + connection when start_tls method failed (#246397) +- save changed settings even if PAM is not set (#248181) +- 2.15.8 + +------------------------------------------------------------------- Thu May 3 13:58:40 CEST 2007 - jsuchome(a)suse.cz - support minimal command line for ldap_browser (#269897) Modified: trunk/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?rev=380… ============================================================================== --- trunk/ldap-client/src/Ldap.ycp (original) +++ trunk/ldap-client/src/Ldap.ycp Wed May 23 10:06:23 2007 @@ -883,6 +883,103 @@ } /** + * popup shown after failed connection: ask for retry withou TLS (see bug 246397) + * @return true if user wants to retry without TLS + */ + global define boolean ConnectWithoutTLS (map errmap) { + + UI::OpenDialog (`HBox(`HSpacing (0.5), + `VBox( + `VSpacing (0.5), + // label + `Left (`Heading (Label::ErrorMsg())), + // error message + `Left (`Label (_("Connection to the LDAP server cannot be established."))), + `ReplacePoint (`id(`rp), `Empty()), + `VSpacing (0.2), + `Left (`CheckBox (`id(`details), `opt (`notify), + // checkbox label + _("&Show Details"), false)), + `VSpacing (), + `Left (`Label ( + // question following error message (yes/no buttons follow) +_("A possible cause of the failed connection may be that your client is +configured for TLS/SSL but the server does not support it. + +Retry connection without TLS/SSL?"))), + `HBox ( + `PushButton (`id(`yes), `opt(`key_F10,`default), Label::YesButton()), + `PushButton (`id(`no),`opt(`key_F9), Label::NoButton()) + ) + ), + `HSpacing(0.5)) + ); + any ret = nil; + do + { + ret = UI::UserInput(); + if (ret == `details) + { + if ((boolean)UI::QueryWidget (`id(`details), `Value)) + UI::ReplaceWidget (`id(`rp), `VBox ( + `Label (errmap["msg"]:""))); + else + UI::ReplaceWidget (`id(`rp), `Empty()); + } + } + while (ret != `yes && ret != `no); + UI::CloseDialog (); + return ret == `yes; + } + + /** + * Initializes LDAP agent, offers to turn off TLS if it failed + * @args arguments to use for initializaton (if empty, uses the current values) + */ + global define string LDAPInitWithTLSCheck (map args) { + + string ret = ""; + if (args == $[]) + args = $[ + "hostname" : GetFirstServer (server), + "port" : GetFirstPort (server), + "version" : ldap_v2 ? 2 : 3, + "use_tls" : ldap_tls ? "yes" : "no" + ]; + boolean init = (boolean) SCR::Execute (.ldap, args); + // error message + string unknown = _("Unknown error. Perhaps 'yast2-ldap' is not available."); + if (init == nil) + { + ret = unknown; + } + else + { + if (!init) + { + map errmap = Ldap::LDAPErrorMap (); + if (ldap_tls && errmap["tls_error"]:false && ConnectWithoutTLS (errmap)) + { + args["use_tls"] = false; + init = (boolean) SCR::Execute (.ldap, args); + if (init == nil) + ret = unknown; + else if (!init) + ret = LDAPError(); + } + else + { + ret = errmap["msg"]:""; + if (errmap["server_msg"]:"" != "") + ret = sformat ("%1\n%2", ret, errmap["server_msg"]:""); + } + } + ldap_initialized = init; + } + return ret; + } + + /** * Binds to LDAP server * @param pass password */ @@ -2128,21 +2225,6 @@ WriteLdapConfEntry ("ssl", "no"); Pam::Set ("mkhomedir", mkhomedir); - } - if (start) // ldap used for authentocation - { - // ---------- correct pam_password value for Novell eDirectory - if (pam_password != "nds" && expert_ui) - { - if (!nds_checked && !Mode::autoinst ()) - { - CheckNDS (); - } - if (nds) - { - pam_password = "nds"; - } - } WriteLdapConfEntry ("pam_password", pam_password); @@ -2162,6 +2244,22 @@ (nss_base_shadow != "")? nss_base_shadow : user_base); WriteLdapConfEntry ("nss_base_group", (nss_base_group != "")? nss_base_group : user_base); + } + if (start) // ldap used for authentocation + { + // ---------- correct pam_password value for Novell eDirectory + if (pam_password != "nds" && expert_ui) + { + if (!nds_checked && !Mode::autoinst ()) + { + CheckNDS (); + } + if (nds) + { + pam_password = "nds"; + } + WriteLdapConfEntry ("pam_password", pam_password); + } // override LDAPNOINIT (#217701) WriteLdapConfEntry ("tls_checkpeer", "no"); Modified: trunk/ldap-client/src/LdapPopup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/LdapPopup.ycp?re… ============================================================================== --- trunk/ldap-client/src/LdapPopup.ycp (original) +++ trunk/ldap-client/src/LdapPopup.ycp Wed May 23 10:06:23 2007 @@ -187,10 +187,10 @@ "version" : Ldap::ldap_v2 ? 2 : 3, "use_tls" : Ldap::ldap_tls ? "yes" : "no" ]; - boolean init = (boolean) SCR::Execute (.ldap, args); - if (init == nil || !init) + string error = Ldap::LDAPInitWithTLSCheck (args); + if (error != "") { - Ldap::LDAPErrorMessage ("init", Ldap::LDAPError ()); + Ldap::LDAPErrorMessage ("init", error); return root_dn; } return BrowseTree (root_dn); Modified: trunk/ldap-client/src/ldap_browser.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ldap_browser.ycp… ============================================================================== --- trunk/ldap-client/src/ldap_browser.ycp (original) +++ trunk/ldap-client/src/ldap_browser.ycp Wed May 23 10:06:23 2007 @@ -89,55 +89,6 @@ return size (tmp_data) > 0; } - /** - * popup shown after failed connection: ask for retry withou TLS (see bug 246397) - * @return true if user wants to retry without TLS - */ - define boolean connect_without_tls (map errmap) { - - UI::OpenDialog (`HBox(`HSpacing (0.5), - `VBox( - `VSpacing (0.5), - // label - `Left (`Heading (Label::ErrorMsg())), - // error message - `Left (`Label (_("Connection to the LDAP server cannot be established."))), - `ReplacePoint (`id(`rp), `Empty()), - `VSpacing (0.2), - `Left (`CheckBox (`id(`details), `opt (`notify), - // checkbox label - _("&Show Details"), false)), - `VSpacing (), - `Left (`Label ( - // question following error message (yes/no buttons follow) -_("A possible cause of the failed connection may be that your client is -configured for TLS/SSL but the server does not support it. - -Retry connection without TLS/SSL?"))), - `HBox ( - `PushButton (`id(`yes), `opt(`key_F10,`default), Label::YesButton()), - `PushButton (`id(`no),`opt(`key_F9), Label::NoButton()) - ) - ), - `HSpacing(0.5)) - ); - any ret = nil; - do - { - ret = UI::UserInput(); - if (ret == `details) - { - if ((boolean)UI::QueryWidget (`id(`details), `Value)) - UI::ReplaceWidget (`id(`rp), `VBox ( - `Label (errmap["msg"]:""))); - else - UI::ReplaceWidget (`id(`rp), `Empty()); - } - } - while (ret != `yes && ret != `no); - UI::CloseDialog (); - return ret == `yes; - } // helper: create the value that should be shown instead of whole DN in tree define string show_dn (string dn) { @@ -367,31 +318,11 @@ Ldap::bind_pass = (string) UI::QueryWidget(`id(`pw), `Value); Ldap::SetAnonymous (ret == `anon); - string error = ""; - map args = $[ - "hostname" : Ldap::GetFirstServer (Ldap::server), - "port" : Ldap::GetFirstPort (Ldap::server), - "version" : Ldap::ldap_v2 ? 2 : 3, - "use_tls" : Ldap::ldap_tls ? "yes" : "no" - ]; - if (SCR::Execute (.ldap, args) != true) + string error = Ldap::LDAPInitWithTLSCheck ($[]); + if (error != "") { - map errmap = Ldap::LDAPErrorMap (); - if (Ldap::ldap_tls && errmap["tls_error"]:false && connect_without_tls (errmap)) - { - Ldap::ldap_tls = false; - error = Ldap::LDAPInit (); - if (error != "") - { - Ldap::LDAPErrorMessage ("init", error); - continue; - } - } - else - { - Ldap::LDAPErrorMessage ("init", errmap["msg"]:""); - continue; - } + Ldap::LDAPErrorMessage ("init", error); + continue; } error = Ldap::LDAPBind (Ldap::bind_pass); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0