December 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] <web-client> master : restart on lighttpd update (bnc#559534)
by Klaus Kämpf 02 Dec '09

02 Dec '09

ref: refs/heads/master commit c757b3942ea6e6542a0cb82f9f753dfbc02bc01c Author: Klaus Kämpf <kkaempf(a)suse.de> Date: Wed Dec 2 20:42:35 2009 +0100 restart on lighttpd update (bnc#559534) --- webclient/package/yast2-webclient.changes | 6 ++++++ webclient/package/yast2-webclient.spec | 6 +++++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/webclient/package/yast2-webclient.changes b/webclient/package/yast2-webclient.changes index 15487fe..fdbefcd 100644 --- a/webclient/package/yast2-webclient.changes +++ b/webclient/package/yast2-webclient.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Dec 2 20:41:21 CET 2009 - kkaempf(a)suse.de + +- trigger service restart on lighttpd update (bnc#559534) +- 0.0.27 + +------------------------------------------------------------------- Fri Nov 27 11:44:25 UTC 2009 - jreidinger(a)novell.com - show only SLE11 supported languages (bnc#557768) diff --git a/webclient/package/yast2-webclient.spec b/webclient/package/yast2-webclient.spec index 57ff506..1ce5122 100644 --- a/webclient/package/yast2-webclient.spec +++ b/webclient/package/yast2-webclient.spec @@ -17,7 +17,7 @@ PreReq: rubygem-gettext_rails License: LGPL v2.1;ASLv2.0 Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.26 +Version: 0.0.27 Release: 0 Summary: YaST2 - Webclient Source: www.tar.bz2 @@ -117,6 +117,10 @@ chmod 600 db/*.sqlite* log/* %restart_on_update %{service_name} %{insserv_cleanup} +# restart yastwc on lighttpd update (bnc#559534) +%triggerin -- lighttpd +%restart_on_update %{service_name} + %files %defattr(-,root,root) %dir /srv/www/yast -- 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] <web-client> backgroud_patches_bnc550934 : restart on lighttpd update (bnc#559534)
by Klaus Kämpf 02 Dec '09

02 Dec '09

ref: refs/heads/backgroud_patches_bnc550934 commit c757b3942ea6e6542a0cb82f9f753dfbc02bc01c Author: Klaus Kämpf <kkaempf(a)suse.de> Date: Wed Dec 2 20:42:35 2009 +0100 restart on lighttpd update (bnc#559534) --- webclient/package/yast2-webclient.changes | 6 ++++++ webclient/package/yast2-webclient.spec | 6 +++++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/webclient/package/yast2-webclient.changes b/webclient/package/yast2-webclient.changes index 15487fe..fdbefcd 100644 --- a/webclient/package/yast2-webclient.changes +++ b/webclient/package/yast2-webclient.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Dec 2 20:41:21 CET 2009 - kkaempf(a)suse.de + +- trigger service restart on lighttpd update (bnc#559534) +- 0.0.27 + +------------------------------------------------------------------- Fri Nov 27 11:44:25 UTC 2009 - jreidinger(a)novell.com - show only SLE11 supported languages (bnc#557768) diff --git a/webclient/package/yast2-webclient.spec b/webclient/package/yast2-webclient.spec index 57ff506..1ce5122 100644 --- a/webclient/package/yast2-webclient.spec +++ b/webclient/package/yast2-webclient.spec @@ -17,7 +17,7 @@ PreReq: rubygem-gettext_rails License: LGPL v2.1;ASLv2.0 Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.26 +Version: 0.0.27 Release: 0 Summary: YaST2 - Webclient Source: www.tar.bz2 @@ -117,6 +117,10 @@ chmod 600 db/*.sqlite* log/* %restart_on_update %{service_name} %{insserv_cleanup} +# restart yastwc on lighttpd update (bnc#559534) +%triggerin -- lighttpd +%restart_on_update %{service_name} + %files %defattr(-,root,root) %dir /srv/www/yast -- 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] r59917 - in /trunk/theme: SLE/wizard/installation.qss openSUSE/wizard/installation.qss package/yast2-theme.changes
by jimmacfx＠svn.opensuse.org 02 Dec '09

02 Dec '09

Author: jimmacfx Date: Wed Dec 2 19:32:21 2009 New Revision: 59917 URL: http://svn.opensuse.org/viewcvs/yast?rev=59917&view=rev Log: finally nailed the button menu styling. Addresses bnc#458001 and bnc#444400 Modified: trunk/theme/SLE/wizard/installation.qss trunk/theme/openSUSE/wizard/installation.qss trunk/theme/package/yast2-theme.changes Modified: trunk/theme/SLE/wizard/installation.qss URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/SLE/wizard/installation.qs… ============================================================================== --- trunk/theme/SLE/wizard/installation.qss (original) +++ trunk/theme/SLE/wizard/installation.qss Wed Dec 2 19:32:21 2009 @@ -128,22 +128,9 @@ border-radius: 3px; } -QMenu::item:selected { - background-color: white; - color: black; -} - -.ymenubutton { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #a5a5a5, stop: 0.8 #4d4d4d, stop: 1 #545454); -} YQProgressBar > YQWidgetCaption { margin-top: 20px; } -QPushButton::menu-indicator { - subcontrol-origin: margin; - left: -7px; - subcontrol-position: right; -} /* YQMultiProgressMeter::chunk { @@ -346,10 +333,13 @@ } /* odd dropdown button widget */ - #work_area QPushButton::menu-indicator { + #work_area QPushButton::menu-indicator, + #work_area QPushButton::menu-indicator:pressed, + QPushButton::menu-indicator:open { subcontrol-origin: margin; left: -7px; subcontrol-position: right; + image: url(arr_down.png); } #work_area QPushButton:open { /* when the button has its menu open */ @@ -358,18 +348,20 @@ border: 1px solid #dddddd; } - #work_area QPushButton::menu-indicator { - image: url(arr_down.png); - /* - subcontrol-origin: padding; - subcontrol-position: bottom right; - */ - } + /* button menus */ + QPushButton QMenu { + border: 1px solid #888; + + } + QPushButton QMenu::item { + background-color: #bebebe; + color: black; + } - #work_area QPushButton::menu-indicator:pressed, QPushButton::menu-indicator:open { - position: relative; - top: 1px; left: 1px; /* shift the arrow by 1 px */ - } + QPushButton QMenu::item:selected { + background-color: #4d8e0d; + color: white; + } Modified: trunk/theme/openSUSE/wizard/installation.qss URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/wizard/installati… ============================================================================== --- trunk/theme/openSUSE/wizard/installation.qss (original) +++ trunk/theme/openSUSE/wizard/installation.qss Wed Dec 2 19:32:21 2009 @@ -126,14 +126,7 @@ border-radius: 3px; } -QMenu::item:selected { - background-color: white; - color: black; -} -.ymenubutton { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #a5a5a5, stop: 0.8 #4d4d4d, stop: 1 #545454); -} YQProgressBar > YQWidgetCaption { margin-top: 20px; } @@ -353,6 +346,20 @@ border: 1px solid #dddddd; } + /* button menus */ + QPushButton QMenu { + border: 1px solid #888; + + } + QPushButton QMenu::item { + background-color: #bebebe; + color: black; + } + + QPushButton QMenu::item:selected { + background-color: #4d8e0d; + color: white; + } #work_area QProgressBar { border: 1px solid #444; Modified: trunk/theme/package/yast2-theme.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/package/yast2-theme.change… ============================================================================== --- trunk/theme/package/yast2-theme.changes (original) +++ trunk/theme/package/yast2-theme.changes Wed Dec 2 19:32:21 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Dec 2 19:29:14 CET 2009 - jimmac(a)novell.com + +- address the button submenu styling. bnc#444400 and bnc#458001. + +------------------------------------------------------------------- Tue Nov 24 14:52:37 CET 2009 - jimmac(a)novell.com - use wrench for the launcher icon again. In all sizes. The arrdvark mascot added as yast-mascot. bnc#501452, bnc#544921 -- 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] r59916 - /trunk/theme/openSUSE/wizard/installation.qss
by jimmacfx＠svn.opensuse.org 02 Dec '09

02 Dec '09

Author: jimmacfx Date: Wed Dec 2 19:32:17 2009 New Revision: 59916 URL: http://svn.opensuse.org/viewcvs/yast?rev=59916&view=rev Log: remove redundancy and arrow glitch for the pressed state. Modified: trunk/theme/openSUSE/wizard/installation.qss Modified: trunk/theme/openSUSE/wizard/installation.qss URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/wizard/installati… ============================================================================== --- trunk/theme/openSUSE/wizard/installation.qss (original) +++ trunk/theme/openSUSE/wizard/installation.qss Wed Dec 2 19:32:17 2009 @@ -137,12 +137,6 @@ YQProgressBar > YQWidgetCaption { margin-top: 20px; } -QPushButton::menu-indicator { - subcontrol-origin: margin; - left: -7px; - subcontrol-position: right; -} - /* YQMultiProgressMeter::chunk { background-color: green; @@ -344,10 +338,13 @@ } /* odd dropdown button widget */ - #work_area QPushButton::menu-indicator { + #work_area QPushButton::menu-indicator, + #work_area QPushButton::menu-indicator:pressed, + QPushButton::menu-indicator:open { subcontrol-origin: margin; left: -7px; subcontrol-position: right; + image: url(arr_down.png); } #work_area QPushButton:open { /* when the button has its menu open */ @@ -356,20 +353,6 @@ border: 1px solid #dddddd; } - #work_area QPushButton::menu-indicator { - image: url(arr_down.png); - /* - subcontrol-origin: padding; - subcontrol-position: bottom right; - */ - } - - #work_area QPushButton::menu-indicator:pressed, QPushButton::menu-indicator:open { - position: relative; - top: 1px; left: 1px; /* shift the arrow by 1 px */ - } - - #work_area QProgressBar { border: 1px solid #444; -- 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] r59915 - in /branches/SuSE-Code-11-Branch/theme: SLE/wizard/installation.qss package/yast2-theme.changes
by jimmacfx＠svn.opensuse.org 02 Dec '09

02 Dec '09

Author: jimmacfx Date: Wed Dec 2 19:32:05 2009 New Revision: 59915 URL: http://svn.opensuse.org/viewcvs/yast?rev=59915&view=rev Log: address button menu styling. bnc#444400 Modified: branches/SuSE-Code-11-Branch/theme/SLE/wizard/installation.qss branches/SuSE-Code-11-Branch/theme/package/yast2-theme.changes Modified: branches/SuSE-Code-11-Branch/theme/SLE/wizard/installation.qss URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/theme/SLE… ============================================================================== --- branches/SuSE-Code-11-Branch/theme/SLE/wizard/installation.qss (original) +++ branches/SuSE-Code-11-Branch/theme/SLE/wizard/installation.qss Wed Dec 2 19:32:05 2009 @@ -128,22 +128,9 @@ border-radius: 3px; } -QMenu::item:selected { - background-color: white; - color: black; -} - -.ymenubutton { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #a5a5a5, stop: 0.8 #4d4d4d, stop: 1 #545454); -} YQProgressBar > YQWidgetCaption { margin-top: 20px; } -QPushButton::menu-indicator { - subcontrol-origin: margin; - left: -7px; - subcontrol-position: right; -} /* YQMultiProgressMeter::chunk { @@ -346,10 +333,13 @@ } /* odd dropdown button widget */ - #work_area QPushButton::menu-indicator { + #work_area QPushButton::menu-indicator, + #work_area QPushButton::menu-indicator:pressed, + QPushButton::menu-indicator:open { subcontrol-origin: margin; left: -7px; subcontrol-position: right; + image: url(arr_down.png); } #work_area QPushButton:open { /* when the button has its menu open */ @@ -358,18 +348,20 @@ border: 1px solid #dddddd; } - #work_area QPushButton::menu-indicator { - image: url(arr_down.png); - /* - subcontrol-origin: padding; - subcontrol-position: bottom right; - */ - } + /* button menus */ + QPushButton QMenu { + border: 1px solid #888; + + } + QPushButton QMenu::item { + background-color: #bebebe; + color: black; + } - #work_area QPushButton::menu-indicator:pressed, QPushButton::menu-indicator:open { - position: relative; - top: 1px; left: 1px; /* shift the arrow by 1 px */ - } + QPushButton QMenu::item:selected { + background-color: #4d8e0d; + color: white; + } Modified: branches/SuSE-Code-11-Branch/theme/package/yast2-theme.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/theme/pac… ============================================================================== --- branches/SuSE-Code-11-Branch/theme/package/yast2-theme.changes (original) +++ branches/SuSE-Code-11-Branch/theme/package/yast2-theme.changes Wed Dec 2 19:32:05 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Dec 2 19:31:45 CET 2009 - jimmac(a)novell.com + +- fix for bnc#444400 from trunk + +------------------------------------------------------------------- Wed Nov 4 13:45:23 CET 2009 - jimmac(a)novell.com - fixes to the focus state of the widgets and checkboxes take from trunk. bnc#445418, bnc#471861 -- 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] r59914 - /tags/branch-Code-11-SP1-2_17_64/bootloader/
by juhliarik＠svn.opensuse.org 02 Dec '09

02 Dec '09

Author: juhliarik Date: Wed Dec 2 17:04:38 2009 New Revision: 59914 URL: http://svn.opensuse.org/viewcvs/yast?rev=59914&view=rev Log: Created tag branch-Code-11-SP1-2_17_64 for bootloader Added: tags/branch-Code-11-SP1-2_17_64/bootloader/ (props changed) - copied from r59913, branches/SuSE-Code-11-SP1-Branch/bootloader/ -- 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] r59913 - /tags/branch-Code-11-SP1-2_17_64/
by juhliarik＠svn.opensuse.org 02 Dec '09

02 Dec '09

Author: juhliarik Date: Wed Dec 2 17:04:32 2009 New Revision: 59913 URL: http://svn.opensuse.org/viewcvs/yast?rev=59913&view=rev Log: Created tag branch-Code-11-SP1-2_17_64 Added: tags/branch-Code-11-SP1-2_17_64/ -- 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] r59912 - in /branches/SuSE-Code-11-SP1-Branch/bootloader: VERSION package/yast2-bootloader.changes src/modules/BootPOWERLILO.ycp src/modules/Bootloader.ycp
by juhliarik＠svn.opensuse.org 02 Dec '09

02 Dec '09

Author: juhliarik Date: Wed Dec 2 17:04:21 2009 New Revision: 59912 URL: http://svn.opensuse.org/viewcvs/yast?rev=59912&view=rev Log: added fix for better checking of duplicated boot sections in PPC (bnc#448093) Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootPOWERLILO.ycp branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/Bootloader.ycp Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION Wed Dec 2 17:04:21 2009 @@ -1 +1 @@ -2.17.63 +2.17.64 Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes Wed Dec 2 17:04:21 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Dec 2 17:02:29 CET 2009 - juhliarik(a)suse.cz + +- added better checking of duplicated boot section for PPC + (bnc#448093) +- 2.17.64 + +------------------------------------------------------------------- Wed Dec 2 14:56:42 CET 2009 - juhliarik(a)suse.cz - added fix for update of bootloader seetings (bnc#474039) Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootPOWERLILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootPOWERLILO.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootPOWERLILO.ycp Wed Dec 2 17:04:21 2009 @@ -412,7 +412,7 @@ * @param title string the section name to create (untranslated) * @return map describes the section */ -map<string,any> CreateImageSection (string title) { +global map<string,any> CreateImageSection (string title) { // FIXME: This really should be a function and not be duplicated in // BootCommon.ycp (although that code there also handles wildcard Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/Bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/Bootloader.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/Bootloader.ycp Wed Dec 2 17:04:21 2009 @@ -41,7 +41,6 @@ import "BootPOWERLILO"; // The ppc-LILO File //fate 303395 import "ProductFeatures"; - import "Arch"; // interface for clients global define map Export (); @@ -862,9 +861,17 @@ return; } y2milestone("Deleting duplicated boot sections"); - map<string,any> linux_default = BootCommon::CreateLinuxSection ("linux"); - map<string,any> linux_failsafe = BootCommon::CreateLinuxSection ("failsafe"); - map<string,any> linux_xen = BootCommon::CreateLinuxSection ("xen"); + map<string,any> linux_default = $[]; + map<string,any> linux_failsafe = $[]; + map<string,any> linux_xen = $[]; + if (Arch::ppc()) + { + linux_default = BootPOWERLILO::CreateImageSection("linux"); + } else { + linux_default = BootCommon::CreateLinuxSection ("linux"); + linux_failsafe = BootCommon::CreateLinuxSection ("failsafe"); + linux_xen = BootCommon::CreateLinuxSection ("xen"); + } y2milestone("Proposed section for linux_default: %1", linux_default); y2milestone("Proposed section for linux_failsafe: %1", linux_failsafe); -- 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] r59911 - in /branches/SuSE-Code-11-SP1-Branch/ldap-server/src: agent/SlapdConfigAgent.cc lib/slapd-config.cpp lib/slapd-config.h
by rhafer＠svn.opensuse.org 02 Dec '09

02 Dec '09

Author: rhafer Date: Wed Dec 2 16:57:58 2009 New Revision: 59911 URL: http://svn.opensuse.org/viewcvs/yast?rev=59911&view=rev Log: Always add "tls_reqcert demand" to workaround bnc#558397) Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/agent/SlapdConfigAgent.cc branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.cpp branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.h Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/agent/SlapdConfigAgent.cc Wed Dec 2 16:57:58 2009 @@ -1709,6 +1709,7 @@ sr->setCredentials( cred ); // default retry (every 120 seconds) sr->setRetryString( "120 +" ); + sr->setTlsReqCert("demand"); if ( starttls ) { Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.cpp (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.cpp Wed Dec 2 16:57:58 2009 @@ -846,6 +846,7 @@ const std::string OlcSyncRepl::INTERVAL="interval"; const std::string OlcSyncRepl::STARTTLS="starttls"; const std::string OlcSyncRepl::RETRY="retry"; +const std::string OlcSyncRepl::TLS_REQCERT="tls_reqcert"; OlcSyncRepl::OlcSyncRepl( const std::string &syncreplLine): rid(1), @@ -944,6 +945,10 @@ { this->setRetryString(value); } + else if ( key == TLS_REQCERT ) + { + this->setTlsReqCert(value); + } else { otherValues.push_back(make_pair(key, value)); @@ -977,6 +982,10 @@ { srlStream << "starttls=critical "; } + if (! this->tlsReqCert.empty() ) + { + srlStream << "tls_reqcert=" << tlsReqCert << " "; + } srlStream << "bindmethod=\"" << this->bindmethod << "\" " << "binddn=\"" << this->binddn << "\" " << "credentials=\"" << this->credentials << "\""; @@ -1043,6 +1052,11 @@ retryString = value; } +void OlcSyncRepl::setTlsReqCert( const std::string &value ) +{ + tlsReqCert = value; +} + int OlcSyncRepl::getRid() const { return rid; @@ -1093,6 +1107,10 @@ return starttls; } +std::string OlcSyncRepl::getTlsReqCert() const +{ + return tlsReqCert; +} OlcSecurity::OlcSecurity(const std::string &securityVal) { Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.h (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.h Wed Dec 2 16:57:58 2009 @@ -252,6 +252,7 @@ const static std::string INTERVAL; const static std::string STARTTLS; const static std::string RETRY; + const static std::string TLS_REQCERT; std::string toSyncReplLine() const; @@ -265,6 +266,7 @@ void setInterval( int days, int hours, int mins, int secs ); void setStartTls( StartTls tls ); void setRetryString( const std::string &value ); + void setTlsReqCert( const std::string &value ); int getRid() const; LDAPUrl getProvider() const; @@ -275,6 +277,7 @@ std::string getCredentials() const; void getInterval( int &days, int &hours, int &mins, int &secs ) const; StartTls getStartTls() const; + std::string getTlsReqCert() const; private: int rid; @@ -285,6 +288,7 @@ std::string binddn; std::string credentials; std::string retryString; + std::string tlsReqCert; int refreshOnlyDays; int refreshOnlyHours; int refreshOnlyMins; -- 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] r59910 - in /branches/SuSE-Code-11-SP1-Branch/ldap-server/src: LdapServer.pm dialogs.ycp
by rhafer＠svn.opensuse.org 02 Dec '09

02 Dec '09

Author: rhafer Date: Wed Dec 2 16:57:52 2009 New Revision: 59910 URL: http://svn.opensuse.org/viewcvs/yast?rev=59910&view=rev Log: Reset config after ServerType Selection (bnc#559912) Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm branches/SuSE-Code-11-SP1-Branch/ldap-server/src/dialogs.ycp Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm Wed Dec 2 16:57:52 2009 @@ -2864,6 +2864,7 @@ SCR->Execute(".ldapserver.commitChanges" ); SCR->Execute(".ldapserver.reset" ); + $globals_initialized = 0; $self->CreateSyncReplAccount(); $syncreplbaseconfig->{'binddn'} = "cn=config"; $syncreplbaseconfig->{'credentials'} = $auth_info->{'cn=config'}->{'bind_pw'}; Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/dialogs.ycp Wed Dec 2 16:57:52 2009 @@ -354,6 +354,7 @@ LdapServer::WriteSetupMaster(false); LdapServer::WriteSetupSlave(false); } + SCR::Execute(.ldapserver.reset); } return ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0