January 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r63185 - in /branches/SuSE-SLE-10-SP4-Branch/vm: package/yast2-vm.changes src/vm_finish.ycp
by charlesa＠svn2.opensuse.org 14 Jan '11

14 Jan '11

Author: charlesa Date: Fri Jan 14 17:54:10 2011 New Revision: 63185 URL: http://svn.opensuse.org/viewcvs/yast?rev=63185&view=rev Log: - bnc#488598 - chkconfig and insserv fail on init scripts that depend on /etc/init.d/boot.clock in Xen domU Modified: branches/SuSE-SLE-10-SP4-Branch/vm/package/yast2-vm.changes branches/SuSE-SLE-10-SP4-Branch/vm/src/vm_finish.ycp Modified: branches/SuSE-SLE-10-SP4-Branch/vm/package/yast2-vm.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/vm/pac… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/vm/package/yast2-vm.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/vm/package/yast2-vm.changes Fri Jan 14 17:54:10 2011 @@ -6,6 +6,12 @@ sles10-sp4 ------------------------------------------------------------------- +Wed Apr 1 08:59:31 MDT 2009 - carnold(a)novell.com + +- bnc#488598 - chkconfig and insserv fail on init scripts that + depend on /etc/init.d/boot.clock in Xen domU + +------------------------------------------------------------------- Thu Apr 3 15:06:18 MDT 2008 - carnold(a)novell.com - bnc#375482 - Xen networking does not work with the firewall Modified: branches/SuSE-SLE-10-SP4-Branch/vm/src/vm_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/vm/src… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/vm/src/vm_finish.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/vm/src/vm_finish.ycp Fri Jan 14 17:54:10 2011 @@ -90,15 +90,6 @@ } ); - // these services need force option to disable them - list<string> disable_services_force = ["boot.clock"]; - y2milestone("disabling services (forced): %1", disable_services_force); - foreach(string s, disable_services_force, { - integer disabled = (integer) SCR::Execute(.target.bash, sformat("/sbin/insserv -r -f %1", s)); - y2milestone("insserv-force: service %1 disabled: %2", s, (disabled == 0) ? true : false); - } - ); - // We no longer need to do remove these entries now that we use xvc //SCR::Execute(.target.bash, "/bin/sed -i 's/.*mingetty tty[2-9]$//' /etc/inittab"); -- 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] r63184 - in /branches/SuSE-SLE-10-SP4-Branch/vm: VERSION package/yast2-vm.changes src/vm_finish.ycp
by charlesa＠svn2.opensuse.org 14 Jan '11

14 Jan '11

Author: charlesa Date: Fri Jan 14 17:29:30 2011 New Revision: 63184 URL: http://svn.opensuse.org/viewcvs/yast?rev=63184&view=rev Log: - bnc#628256 - sysvinit: Id "x0" respawning too fast - bnc#664172 - CitrixXenServer popup error messages about sles10-sp4 Modified: branches/SuSE-SLE-10-SP4-Branch/vm/VERSION branches/SuSE-SLE-10-SP4-Branch/vm/package/yast2-vm.changes branches/SuSE-SLE-10-SP4-Branch/vm/src/vm_finish.ycp Modified: branches/SuSE-SLE-10-SP4-Branch/vm/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/vm/VER… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/vm/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/vm/VERSION Fri Jan 14 17:29:30 2011 @@ -1 +1 @@ -2.13.78 +2.13.79 Modified: branches/SuSE-SLE-10-SP4-Branch/vm/package/yast2-vm.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/vm/pac… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/vm/package/yast2-vm.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/vm/package/yast2-vm.changes Fri Jan 14 17:29:30 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jan 14 09:30:44 MST 2011 - carnold(a)novell.com + +- bnc#628256 - sysvinit: Id "x0" respawning too fast +- bnc#664172 - CitrixXenServer popup error messages about + sles10-sp4 + +------------------------------------------------------------------- Thu Apr 3 15:06:18 MDT 2008 - carnold(a)novell.com - bnc#375482 - Xen networking does not work with the firewall Modified: branches/SuSE-SLE-10-SP4-Branch/vm/src/vm_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/vm/src… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/vm/src/vm_finish.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/vm/src/vm_finish.ycp Fri Jan 14 17:29:30 2011 @@ -38,6 +38,7 @@ import "Arch"; import "Report"; +import "FileUtils"; any ret = nil; string func = ""; @@ -105,8 +106,15 @@ y2milestone("check for xvc0 in inittab and securetty"); if ( !contains(SCR::Dir(.etc.inittab), "x0") ) { + y2milestone("Adding the x0 entry in the inittab file"); SCR::Write (.etc.inittab.x0, sformat ("12345:respawn:/sbin/agetty -L 9600 xvc0 xterm")); SCR::Write (.etc.inittab, nil); + string dev_xvc0 = "/dev/xvc0"; + if ( ! FileUtils::Exists(dev_xvc0) ) + { + y2milestone("%1 not found, commenting out the x0 entry in the inittab", dev_xvc0); + SCR::Execute(.target.bash,"/bin/sed --in-place 's/^x0:/#x0:/g' /etc/inittab"); + } } SCR::Execute(.target.bash,"/usr/bin/grep -q xvc0 /etc/securetty || echo xvc0 >> /etc/securetty"); -- 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] r63183 - /tags/branch-SLE-10-SP4-2_13_79/vm/
by charlesa＠svn2.opensuse.org 14 Jan '11

14 Jan '11

Author: charlesa Date: Fri Jan 14 17:28:40 2011 New Revision: 63183 URL: http://svn.opensuse.org/viewcvs/yast?rev=63183&view=rev Log: Created tag branch-SLE-10-SP4-2_13_79 for vm Added: tags/branch-SLE-10-SP4-2_13_79/vm/ - copied from r63182, branches/SuSE-SLE-10-SP4-Branch/vm/ -- 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] r63182 - /tags/branch-SLE-10-SP4-2_13_79/
by charlesa＠svn2.opensuse.org 14 Jan '11

14 Jan '11

Author: charlesa Date: Fri Jan 14 17:28:26 2011 New Revision: 63182 URL: http://svn.opensuse.org/viewcvs/yast?rev=63182&view=rev Log: Created tag branch-SLE-10-SP4-2_13_79 Added: tags/branch-SLE-10-SP4-2_13_79/ -- 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] r63181 - in /branches/SuSE-Code-11-SP1-Branch/qt: VERSION.cmake package/yast2-qt.changes src/YQUI.cc
by tgoettlicher＠svn2.opensuse.org 14 Jan '11

14 Jan '11

Author: tgoettlicher Date: Fri Jan 14 11:38:37 2011 New Revision: 63181 URL: http://svn.opensuse.org/viewcvs/yast?rev=63181&view=rev Log: - Fixed hanging browse dialogs (bnc #580143) Modified: branches/SuSE-Code-11-SP1-Branch/qt/VERSION.cmake branches/SuSE-Code-11-SP1-Branch/qt/package/yast2-qt.changes branches/SuSE-Code-11-SP1-Branch/qt/src/YQUI.cc Modified: branches/SuSE-Code-11-SP1-Branch/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/qt/VE… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/qt/VERSION.cmake (original) +++ branches/SuSE-Code-11-SP1-Branch/qt/VERSION.cmake Fri Jan 14 11:38:37 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "18") -SET(VERSION_PATCH "12") +SET(VERSION_PATCH "13") Modified: branches/SuSE-Code-11-SP1-Branch/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/qt/pa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/qt/package/yast2-qt.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/qt/package/yast2-qt.changes Fri Jan 14 11:38:37 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 14 11:37:21 CET 2011 - tgoettlicher(a)suse.de + +- Fixed hanging browse dialogs (bnc #580143) +- V 2.19.13 + +------------------------------------------------------------------- Wed Nov 24 14:25:12 CET 2010 - tgoettlicher(a)suse.de - fixed hanging file chooser dialog (bnc #642270) Modified: branches/SuSE-Code-11-SP1-Branch/qt/src/YQUI.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/qt/sr… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/qt/src/YQUI.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/qt/src/YQUI.cc Fri Jan 14 11:38:37 2011 @@ -140,9 +140,6 @@ // Probe X11 display for better error handling if it can't be opened probeX11Display( cmdLine ); - // YaST2 has no use for the glib event loop - setenv( "QT_NO_GLIB", "1", 1 ); - yuiDebug() << "Creating QApplication" << endl; new QApplication( _ui_argc, argv ); Q_CHECK_PTR( qApp ); -- 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] r63180 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes src/YQUI.cc
by tgoettlicher＠svn2.opensuse.org 14 Jan '11

14 Jan '11

Author: tgoettlicher Date: Fri Jan 14 11:27:39 2011 New Revision: 63180 URL: http://svn.opensuse.org/viewcvs/yast?rev=63180&view=rev Log: - Fixed hanging browse dialogs (bnc #580143) - V 2.19.7 Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/src/YQUI.cc Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=63180&r1=63… ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Fri Jan 14 11:27:39 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "19") -SET(VERSION_PATCH "6") +SET(VERSION_PATCH "7") 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 Fri Jan 14 11:27:39 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 14 11:25:33 CET 2011 - tgoettlicher(a)suse.de + +- Fixed hanging browse dialogs (bnc #580143) +- V 2.19.7 + +------------------------------------------------------------------- Wed Jan 12 15:01:20 CET 2011 - tgoettlicher(a)suse.de - Fixed LogView's scroller Modified: trunk/qt/src/YQUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQUI.cc?rev=63180&r1=6317… ============================================================================== --- trunk/qt/src/YQUI.cc (original) +++ trunk/qt/src/YQUI.cc Fri Jan 14 11:27:39 2011 @@ -162,9 +162,6 @@ // Probe X11 display for better error handling if it can't be opened probeX11Display( cmdLine ); - // YaST2 has no use for the glib event loop - setenv( "QT_NO_GLIB", "1", 1 ); - yuiDebug() << "Creating QApplication" << endl; new QApplication( _ui_argc, argv ); Q_CHECK_PTR( qApp ); -- 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] r63179 - /branches/SuSE-SLE-10-SP3-Branch/samba-server/src/SambaServer.pm
by locilka＠svn2.opensuse.org 13 Jan '11

13 Jan '11

Author: locilka Date: Thu Jan 13 16:11:30 2011 New Revision: 63179 URL: http://svn.opensuse.org/viewcvs/yast?rev=63179&view=rev Log: Ooh, $this sometimes happens 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 Thu Jan 13 16:11:30 2011 @@ -395,8 +395,8 @@ # Check whether any 'samba' is installed and keep it if (PackageSystem->InstalledAny($RequiredPackages_gplv3)) { - return { install => $RequiredPackages, remove => []}; - # If any other samba (GPLv3) or none is installed, prefer the GPLv3 + return { install => $RequiredPackages_gplv3, remove => []}; + # If any other samba or none is installed } else { 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] r63178 - in /trunk/qt-pkg: VERSION.cmake package/yast2-qt-pkg.changes src/YQPackageSelector.cc
by tgoettlicher＠svn2.opensuse.org 13 Jan '11

13 Jan '11

Author: tgoettlicher Date: Thu Jan 13 16:08:40 2011 New Revision: 63178 URL: http://svn.opensuse.org/viewcvs/yast?rev=63178&view=rev Log: fixed preselected items in package list (bnc #661743) Modified: trunk/qt-pkg/VERSION.cmake trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPackageSelector.cc Modified: trunk/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=63178&r… ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Thu Jan 13 16:08:40 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "20") -SET(VERSION_PATCH "1") +SET(VERSION_PATCH "2") Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.chan… ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Thu Jan 13 16:08:40 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 13 16:07:10 CET 2011 - tgoettlicher(a)suse.de + +- fixed preselected items in package list (bnc #661743) +- 2.20.2 + +------------------------------------------------------------------- Tue Oct 12 15:57:01 CEST 2010 - tgoettlicher(a)suse.de - fixed bnc #422226: Switching patterns should scroll the Modified: trunk/qt-pkg/src/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPackageSelector.cc?… ============================================================================== --- trunk/qt-pkg/src/YQPackageSelector.cc (original) +++ trunk/qt-pkg/src/YQPackageSelector.cc Thu Jan 13 16:08:40 2011 @@ -224,6 +224,7 @@ { _filters->showPage( _statusFilterView ); _statusFilterView->filter(); + _pkgList->selectNextItem(); } else if ( _patternList ) { -- 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] r63177 - /tags/stable-2_20_6/ldap-client/
by jsuchome＠svn2.opensuse.org 13 Jan '11

13 Jan '11

Author: jsuchome Date: Thu Jan 13 11:52:10 2011 New Revision: 63177 URL: http://svn.opensuse.org/viewcvs/yast?rev=63177&view=rev Log: Created tag stable-2_20_6 for ldap-client Added: tags/stable-2_20_6/ldap-client/ - copied from r63176, 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] r63176 - in /trunk/ldap-client: VERSION package/yast2-ldap-client.changes src/Ldap.ycp src/LdapPopup.ycp src/ui.ycp testsuite/tests/LDAPInit.out testsuite/tests/LDAPInit.ycp
by jsuchome＠svn2.opensuse.org 13 Jan '11

13 Jan '11

Author: jsuchome Date: Thu Jan 13 11:51:59 2011 New Revision: 63176 URL: http://svn.opensuse.org/viewcvs/yast?rev=63176&view=rev Log: - pass certificate data to .ldap agent (bnc#662949) - 2.20.6 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/ui.ycp trunk/ldap-client/testsuite/tests/LDAPInit.out trunk/ldap-client/testsuite/tests/LDAPInit.ycp Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=63176&r1… ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Thu Jan 13 11:51:59 2011 @@ -1 +1 @@ -2.20.5 +2.20.6 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 Thu Jan 13 11:51:59 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 13 11:37:48 CET 2011 - jsuchome(a)suse.cz + +- pass certificate data to .ldap agent (bnc#662949) +- 2.20.6 + +------------------------------------------------------------------- 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 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 Thu Jan 13 11:51:59 2011 @@ -1044,7 +1044,9 @@ "hostname": GetFirstServer (server), "port": GetFirstPort (server), "version": ldap_v2 ? 2 : 3, - "use_tls": ldap_tls ? "yes" : "no" + "use_tls": ldap_tls ? "yes" : "no", + "cacertdir" : Ldap::tls_cacertdir, + "cacertfile": Ldap::tls_cacertfile ]; boolean init = (boolean) SCR::Execute (.ldap, args); if (init == nil) @@ -1126,7 +1128,9 @@ "hostname" : GetFirstServer (server), "port" : GetFirstPort (server), "version" : ldap_v2 ? 2 : 3, - "use_tls" : ldap_tls ? "yes" : "no" + "use_tls" : ldap_tls ? "yes" : "no", + "cacertdir" : Ldap::tls_cacertdir, + "cacertfile" : Ldap::tls_cacertfile ]; boolean init = (boolean) SCR::Execute (.ldap, args); // error message @@ -1143,7 +1147,7 @@ if (args["use_tls"]:"" == "yes" && errmap["tls_error"]:false && ConnectWithoutTLS (errmap)) { - args["use_tls"] = false; + args["use_tls"] = "no"; init = (boolean) SCR::Execute (.ldap, args); if (init == nil) ret = unknown; 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 Thu Jan 13 11:51:59 2011 @@ -189,7 +189,9 @@ "hostname" : Ldap::GetFirstServer (Ldap::server), "port" : Ldap::GetFirstPort (Ldap::server), "version" : Ldap::ldap_v2 ? 2 : 3, - "use_tls" : Ldap::ldap_tls ? "yes" : "no" + "use_tls" : Ldap::ldap_tls ? "yes" : "no", + "cacertdir" : Ldap::tls_cacertdir, + "cacertfile": Ldap::tls_cacertfile ]; string error = Ldap::LDAPInitWithTLSCheck (args); if (error != "") Modified: trunk/ldap-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ui.ycp?rev=63176… ============================================================================== --- trunk/ldap-client/src/ui.ycp (original) +++ trunk/ldap-client/src/ui.ycp Thu Jan 13 11:51:59 2011 @@ -374,7 +374,9 @@ "hostname" : Ldap::GetFirstServer (server), "port" : Ldap::GetFirstPort (server), "version" : Ldap::ldap_v2 ? 2 : 3, - "use_tls" : ldap_tls ? "yes" : "no" + "use_tls" : ldap_tls ? "yes" : "no", + "cacertdir" : Ldap::tls_cacertdir, + "cacertfile" : Ldap::tls_cacertfile ]); if (dn != "") UI::ChangeWidget (`id(`ldapbasedn), `Value, dn); @@ -761,7 +763,9 @@ "hostname" : Ldap::GetFirstServer (Ldap::server), "port" : Ldap::GetFirstPort (Ldap::server), "version" : Ldap::ldap_v2 ? 2 : 3, - "use_tls" : Ldap::ldap_tls ? "yes" : "no" + "use_tls" : Ldap::ldap_tls ? "yes" : "no", + "cacertdir" : Ldap::tls_cacertdir, + "cacertfile": Ldap::tls_cacertfile ]) ) { @@ -1057,7 +1061,9 @@ "hostname" : Ldap::GetFirstServer (Ldap::server), "port" : Ldap::GetFirstPort (Ldap::server), "version" : Ldap::ldap_v2 ? 2 : 3, - "use_tls" : Ldap::ldap_tls ? "yes" : "no" + "use_tls" : Ldap::ldap_tls ? "yes" : "no", + "cacertdir" : Ldap::tls_cacertdir, + "cacertfile": Ldap::tls_cacertfile ]); if (dn != "") { @@ -1132,7 +1138,9 @@ "hostname" : Ldap::GetFirstServer (Ldap::server), "port" : Ldap::GetFirstPort (Ldap::server), "version" : Ldap::ldap_v2 ? 2 : 3, - "use_tls" : Ldap::ldap_tls ? "yes" : "no" + "use_tls" : Ldap::ldap_tls ? "yes" : "no", + "cacertdir" : Ldap::tls_cacertdir, + "cacertfile" : Ldap::tls_cacertfile ]); if (suf != "") UI::ReplaceWidget (`id (`rp_suf), `HBox ( Modified: trunk/ldap-client/testsuite/tests/LDAPInit.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/LDAP… ============================================================================== --- trunk/ldap-client/testsuite/tests/LDAPInit.out (original) +++ trunk/ldap-client/testsuite/tests/LDAPInit.out Thu Jan 13 11:51:59 2011 @@ -1,16 +1,16 @@ Dump ==== init (one server, no port set) ============== Dump ==== value of server: "localhost" -Execute .ldap $["hostname":"localhost", "port":389, "use_tls":"no", "version":3] true +Execute .ldap $["cacertdir":"", "cacertfile":"", "hostname":"localhost", "port":389, "use_tls":"no", "version":3] true Return Dump ==== init (one server, nonsence port set) ======== Dump ==== value of server: "localhost:sdgfd#$" -Execute .ldap $["hostname":"localhost", "port":389, "use_tls":"no", "version":3] true +Execute .ldap $["cacertdir":"", "cacertfile":"", "hostname":"localhost", "port":389, "use_tls":"no", "version":3] true Return Dump ==== init (more servers set, TLS used) =========== Dump ==== value of server: "chimera.suse.cz:333 localhost" -Execute .ldap $["hostname":"chimera.suse.cz", "port":333, "use_tls":"yes", "version":2] true +Execute .ldap $["cacertdir":"/etc/ssl/certs", "cacertfile":"", "hostname":"chimera.suse.cz", "port":333, "use_tls":"yes", "version":2] true Return Dump ==== init failed ================================= -Execute .ldap $["hostname":"chimera.suse.cz", "port":333, "use_tls":"yes", "version":2] false +Execute .ldap $["cacertdir":"/etc/ssl/certs", "cacertfile":"", "hostname":"chimera.suse.cz", "port":333, "use_tls":"yes", "version":2] false Read .ldap.error $["code":11, "msg":"Initialization failed"] Return Initialization failed Modified: trunk/ldap-client/testsuite/tests/LDAPInit.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/LDAP… ============================================================================== --- trunk/ldap-client/testsuite/tests/LDAPInit.ycp (original) +++ trunk/ldap-client/testsuite/tests/LDAPInit.ycp Thu Jan 13 11:51:59 2011 @@ -49,6 +49,7 @@ Ldap::server = "chimera.suse.cz:333 localhost"; Ldap::ldap_v2 = true; Ldap::ldap_tls = true; + Ldap::tls_cacertdir = "/etc/ssl/certs"; DUMP (sformat ("==== value of 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