February 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r63435 - in /trunk/users: VERSION package/yast2-users.changes src/UsersSimple.pm
by jsuchome＠svn2.opensuse.org 17 Feb '11

17 Feb '11

Author: jsuchome Date: Thu Feb 17 11:10:13 2011 New Revision: 63435 URL: http://svn.opensuse.org/viewcvs/yast?rev=63435&view=rev Log: - do not run both 'user' and 'user_non_interactive' steps (bnc#672139) - 2.20.2 Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/src/UsersSimple.pm Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=63435&r1=63434… ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Thu Feb 17 11:10:13 2011 @@ -1 +1 @@ -2.20.1 +2.20.2 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 Thu Feb 17 11:10:13 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Feb 17 10:59:38 CET 2011 - jsuchome(a)suse.cz + +- do not run both 'user' and 'user_non_interactive' steps + (bnc#672139) +- 2.20.2 + +------------------------------------------------------------------- Fri Dec 3 12:41:56 CET 2010 - jsuchome(a)suse.cz - when user is disabled, disable its autologin (bnc#653559) Modified: trunk/users/src/UsersSimple.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersSimple.pm?rev=634… ============================================================================== --- trunk/users/src/UsersSimple.pm (original) +++ trunk/users/src/UsersSimple.pm Thu Feb 17 11:10:13 2011 @@ -918,12 +918,16 @@ } # enable inst_user to either run auth client or write first user if ($after_auth ne "users" || $user_defined) { - y2milestone ("enabling step 'user' for second stage"); + # do not let both steps to run (bnc#672139) if ($user_defined) { + y2milestone ("enabling 'user_non_interactive', disabling 'user' for second stage"); ProductControl->EnableModule ("user_non_interactive"); + ProductControl->DisableModule ("user"); } else { + y2milestone ("enabling 'user', disabling 'user_non_interactive' for second stage"); ProductControl->EnableModule ("user"); + ProductControl->DisableModule ("user_non_interactive"); } } # no user entered + 2nd stage visible => enable clients (bnc#393722) -- 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] r63434 - /trunk/packager/src/modules/WebpinPackageSearch.ycp
by locilka＠svn2.opensuse.org 17 Feb '11

17 Feb '11

Author: locilka Date: Thu Feb 17 11:08:12 2011 New Revision: 63434 URL: http://svn.opensuse.org/viewcvs/yast?rev=63434&view=rev Log: Just a little fix to use the given API instead of internal variables Modified: trunk/packager/src/modules/WebpinPackageSearch.ycp Modified: trunk/packager/src/modules/WebpinPackageSearch.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/WebpinPacka… ============================================================================== --- trunk/packager/src/modules/WebpinPackageSearch.ycp (original) +++ trunk/packager/src/modules/WebpinPackageSearch.ycp Thu Feb 17 11:08:12 2011 @@ -347,7 +347,7 @@ y2milestone ("Distribution not set, guessing '%1'", distribution); } - string url = base_url + search_path + distribution + "/" + URL::EscapeString (search_for, URL::transform_map_passwd); + string url = GetBaseSearchURL() + search_path + distribution + "/" + URL::EscapeString (search_for, URL::transform_map_passwd); y2milestone ("HTTP::Get (%1, %2)", url, temporary_file); map response = HTTP::Get (url, temporary_file); -- 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] r63433 - /trunk/ldap-server/package/yast2-ldap-server.changes
by rhafer＠svn2.opensuse.org 16 Feb '11

16 Feb '11

Author: rhafer Date: Wed Feb 16 14:23:31 2011 New Revision: 63433 URL: http://svn.opensuse.org/viewcvs/yast?rev=63433&view=rev Log: aligned changelog with the actual changelog from obs Modified: trunk/ldap-server/package/yast2-ldap-server.changes Modified: trunk/ldap-server/package/yast2-ldap-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/package/yast2-ldap-s… ============================================================================== --- trunk/ldap-server/package/yast2-ldap-server.changes (original) +++ trunk/ldap-server/package/yast2-ldap-server.changes Wed Feb 16 14:23:31 2011 @@ -11,7 +11,6 @@ Wed Aug 18 15:23:05 CEST 2010 - mzugec(a)suse.cz - fixed typos (bnc#631743) -- 2.19.1 ------------------------------------------------------------------- Thu Jul 22 10:05:25 UTC 2010 - rhafer(a)novell.com @@ -20,11 +19,12 @@ (bnc#619549) ------------------------------------------------------------------- -Tue Jul 6 12:30:23 UTC 2010 - rhafer(a)novell.com +Tue Jul 6 11:29:07 UTC 2010 - rhafer(a)novell.com -- Write tls_cacert option to ldap.conf (bnc#619549) -- Rename ReadInitialDefaults() back to CreateInitialDefaults() - to stay backwards compatible. (bnc#615805) +- Version 2.19.1 + * Write tls_cacert option to ldap.conf (bnc#619549) + * Rename ReadInitialDefaults() back to CreateInitialDefaults() + to stay backwards compatible. (bnc#615805) ------------------------------------------------------------------- Fri Apr 16 09:27:08 UTC 2010 - rhafer(a)novell.com -- 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] r63432 - /tags/stable-2_20_0/ldap-server/
by rhafer＠svn2.opensuse.org 16 Feb '11

16 Feb '11

Author: rhafer Date: Wed Feb 16 14:12:53 2011 New Revision: 63432 URL: http://svn.opensuse.org/viewcvs/yast?rev=63432&view=rev Log: Created tag stable-2_20_0 for ldap-server Added: tags/stable-2_20_0/ldap-server/ (props changed) - copied from r63431, trunk/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

[yast-commit] r63431 - in /trunk/ldap-server: VERSION package/yast2-ldap-server.changes
by rhafer＠svn2.opensuse.org 16 Feb '11

16 Feb '11

Author: rhafer Date: Wed Feb 16 12:02:47 2011 New Revision: 63431 URL: http://svn.opensuse.org/viewcvs/yast?rev=63431&view=rev Log: preparing 2.20.0 Modified: trunk/ldap-server/VERSION trunk/ldap-server/package/yast2-ldap-server.changes Modified: trunk/ldap-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/VERSION?rev=63431&r1… ============================================================================== --- trunk/ldap-server/VERSION (original) +++ trunk/ldap-server/VERSION Wed Feb 16 12:02:47 2011 @@ -1 +1 @@ -2.19.1 +2.20.0 Modified: trunk/ldap-server/package/yast2-ldap-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/package/yast2-ldap-s… ============================================================================== --- trunk/ldap-server/package/yast2-ldap-server.changes (original) +++ trunk/ldap-server/package/yast2-ldap-server.changes Wed Feb 16 12:02:47 2011 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Wed Feb 16 11:00:52 UTC 2011 - rhafer(a)suse.de + +- Version 2.20.0 +- Warn user, when creating a database with a non-standard base DN and + disable base-object creation in such case (bnc#669213) +- Allow non-standard db-directory when creating the first database + (bnc#669213) + +------------------------------------------------------------------- Wed Aug 18 15:23:05 CEST 2010 - mzugec(a)suse.cz - fixed typos (bnc#631743) -- 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] r63430 - in /trunk/ldap-server/src: LdapDatabase.ycp LdapServer.pm ldap-server.ycp tree_structure.ycp
by rhafer＠svn2.opensuse.org 16 Feb '11

16 Feb '11

Author: rhafer Date: Wed Feb 16 12:00:19 2011 New Revision: 63430 URL: http://svn.opensuse.org/viewcvs/yast?rev=63430&view=rev Log: Warn user, when creating a database with a non-standard base DN and disable base-object creation in such case (bnc#669213) Modified: trunk/ldap-server/src/LdapDatabase.ycp trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/ldap-server.ycp trunk/ldap-server/src/tree_structure.ycp Modified: trunk/ldap-server/src/LdapDatabase.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapDatabase.ycp… ============================================================================== --- trunk/ldap-server/src/LdapDatabase.ycp (original) +++ trunk/ldap-server/src/LdapDatabase.ycp Wed Feb 16 12:00:19 2011 @@ -19,6 +19,7 @@ string ldapconf_basedn = ""; boolean createDbDir = false; + boolean createBase = true; term editPolicy = @@ -75,6 +76,17 @@ ) ); + global define boolean GetCreateBase() + { + return createBase; + } + + global define boolean ResetCreateBase() + { + createBase = true; + return true; + } + global define symbol AddDbBasic( boolean createDefaults ) { boolean user_changed_dbdir = false; @@ -297,6 +309,29 @@ Popup::Error( err["msg"]:"" + "\n" + err["details"]:"" ); continue; } + integer rc = LdapServer::CheckSuffixAutoCreate( db["suffix"]:"" ); + if ( rc < 0 ) + { + map<string, string> err = LdapServer::ReadError(); + Popup::Error( err["msg"]:"" + "\n" + err["details"]:"" ); + continue; + } + else if ( rc > 0 ) + { + map<string, string> err = LdapServer::ReadError(); + boolean res = Popup::AnyQuestion(Label::WarningMsg(), + _("The Base Object: \"") + db["suffix"]:"" + + _("\" can not be auto created by YaST.\n") + + err["msg"]:"", + Label::OKButton(), Label::CancelButton(), `focus); + if ( res == false ) { + continue; + } else { + y2debug( "Will not create base objects" ); + createBase = false; + } + + } if( db["directory"]:"" == "" ) { Popup::Error( _("A directory must be specified.") ); @@ -445,7 +480,9 @@ UI::ChangeWidget( `cb_ppolicy_uselockout, `Enabled , true ); UI::ChangeWidget( `te_ppolicy_defaultpolicy, `Enabled , true ); UI::ChangeWidget( `cb_pp_append_basedn, `Enabled, true ); - UI::ChangeWidget( `pb_define_policy, `Enabled , true ); + if (LdapDatabase::GetCreateBase() ) { + UI::ChangeWidget( `pb_define_policy, `Enabled , true ); + } } else { UI::ChangeWidget( `cb_ppolicy_hashcleartext, `Enabled , false ); UI::ChangeWidget( `cb_ppolicy_uselockout, `Enabled , false ); Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Wed Feb 16 12:00:19 2011 @@ -2420,6 +2420,42 @@ return 1; } +## + # Check whether the object named be the supplied LDAP DN can be auto-created. + # @returns 0 in case of success, + # <0 if the supplied DN is invalid + # >0 if autocreation is not possible + # +BEGIN { $TYPEINFO {CheckSuffixAutoCreate} = ["function", "integer", "string" ]; } +sub CheckSuffixAutoCreate +{ + my ($self, $suffix) = @_; + my $object = X500::DN->ParseRFC2253($suffix); + my @attr = $object->getRDN($object->getRDNs()-1)->getAttributeTypes(); + my $val = $object->getRDN($object->getRDNs()-1)->getAttributeValue($attr[0]); + if(!defined $attr[0] || !defined $val) + { + y2error("Error while extracting RDN values"); + $self->SetError( _("Invalid LDAP DN: \""). $suffix. _("\", can't extract RDN values")); + return -1; + } + if( (lc($attr[0]) eq "ou") || ( lc($attr[0]) eq "o") || ( lc($attr[0]) eq "l") || + ( lc($attr[0]) eq "st") || ( lc($attr[0]) eq "dc") ) { + return 0; + } elsif( lc($attr[0]) eq "c") { + if($val !~ /^\w{2}$/) { + $self->SetError( _("The value of the \"c\" Attribute must contain a valid ISO-3166 country 2-letter code."), ""); + y2error("The countryName must be an ISO-3166 country 2-letter code."); + return -1; + } + return 0; + } else { + y2error("First part of suffix must be c=, st=, l=, o=, ou= or dc=."); + $self->SetError( _("First part of suffix must be c=, st=, l=, o=, ou= or dc=."), ""); + return 1; + } +} + BEGIN { $TYPEINFO {CheckDatabase} = ["function", "boolean", [ "map" , "string", "any"] ]; } sub CheckDatabase { @@ -2462,10 +2498,10 @@ } -BEGIN { $TYPEINFO {AddDatabase} = ["function", "boolean", "integer", [ "map" , "string", "any"], "boolean" ]; } +BEGIN { $TYPEINFO {AddDatabase} = ["function", "boolean", "integer", [ "map" , "string", "any"], "boolean", "boolean" ]; } sub AddDatabase { - my ($self, $index, $db, $createDir) = @_; + my ($self, $index, $db, $createDir, $createBase) = @_; if ( ! $self->CheckDatabase($db) ) { return 0; @@ -2577,10 +2613,13 @@ $self->SetError( $err->{'summary'}, $err->{'description'} ); return 0; } - push @added_databases, $db->{'suffix'}; - $self->WriteAuthInfo( $db->{'suffix'}, + + if ( $createBase ) { + push @added_databases, $db->{'suffix'}; + $self->WriteAuthInfo( $db->{'suffix'}, { bind_dn => $db->{'rootdn'}, bind_pw => $db->{'rootpw_clear'} } ); + } return 1; } Modified: trunk/ldap-server/src/ldap-server.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/ldap-server.ycp?… ============================================================================== --- trunk/ldap-server/src/ldap-server.ycp (original) +++ trunk/ldap-server/src/ldap-server.ycp Wed Feb 16 12:00:19 2011 @@ -96,7 +96,7 @@ // y2milestone("db-options : %1", db); // - ret = LdapServer::AddDatabase(0,db, true); + ret = LdapServer::AddDatabase(0,db, true, true); if(!ret) { Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Wed Feb 16 12:00:19 2011 @@ -550,12 +550,13 @@ { rebuild_widget_tree = true; map <string,any> newDb = LdapDatabase::GetDatabase(); - if ( ! LdapServer::AddDatabase(0, newDb, LdapDatabase::GetCreateDir() ) ) + if ( ! LdapServer::AddDatabase(0, newDb, LdapDatabase::GetCreateDir(), LdapDatabase::GetCreateBase() ) ) { map<string, string> err = LdapServer::ReadError(); callback_error = err["msg"]:"" + "\n" + err["details"]:""; return false; } + LdapDatabase::ResetCreateBase(); map <string,any> syncrepl = LdapDatabase::GetSyncRepl(); if ( size(syncrepl) > 0 ) { -- 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] r63429 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes src/YQContextMenu.cc src/YQContextMenu.h
by tgoettlicher＠svn2.opensuse.org 16 Feb '11

16 Feb '11

Author: tgoettlicher Date: Wed Feb 16 11:10:48 2011 New Revision: 63429 URL: http://svn.opensuse.org/viewcvs/yast?rev=63429&view=rev Log: fixed bnc #671147 Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/src/YQContextMenu.cc trunk/qt/src/YQContextMenu.h Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=63429&r1=63… ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Wed Feb 16 11:10:48 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "20") -SET(VERSION_PATCH "2") +SET(VERSION_PATCH "3") 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 Feb 16 11:10:48 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 16 11:14:10 CET 2011 - tgoettlicher(a)suse.de + +- Fixed event handling in context menu (bnc #671147) +- V 2.20.3 + +------------------------------------------------------------------- Fri Feb 11 14:57:41 CET 2011 - tgoettlicher(a)suse.de - Fixed event handling in tree widget Modified: trunk/qt/src/YQContextMenu.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQContextMenu.cc?rev=6342… ============================================================================== --- trunk/qt/src/YQContextMenu.cc (original) +++ trunk/qt/src/YQContextMenu.cc Wed Feb 16 11:10:48 2011 @@ -52,6 +52,7 @@ YQContextMenu::YQContextMenu() : QObject () , YContextMenu( ) + , _suppressCancelEvent(false ) { yuiWarning() << "YQContextMenu"; @@ -147,14 +148,17 @@ { // dirty hack // see menuEntryActivated() for details - QTimer::singleShot( 100, this, SLOT( slotReturnMenuHidden() ) ); + QTimer::singleShot( 150, this, SLOT( slotReturnMenuHidden() ) ); } void YQContextMenu::slotReturnMenuHidden() { - YQUI::ui()->sendEvent( new YCancelEvent() ); + if ( ! _suppressCancelEvent ) + YQUI::ui()->sendEvent( new YCancelEvent() ); + + _suppressCancelEvent = false; } @@ -181,6 +185,7 @@ /* * the 100 delay is a ugly dirty workaround */ + _suppressCancelEvent = true; QTimer::singleShot( 100, this, SLOT( returnNow() ) ); } else Modified: trunk/qt/src/YQContextMenu.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQContextMenu.h?rev=63429… ============================================================================== --- trunk/qt/src/YQContextMenu.h (original) +++ trunk/qt/src/YQContextMenu.h Wed Feb 16 11:10:48 2011 @@ -150,6 +150,7 @@ private: QPoint _position; + bool _suppressCancelEvent; }; -- 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] r63428 - in /branches/SuSE-Code-11-SP2-Branch/ncurses: package/yast2-ncurses.changes src/NCMultiSelectionBox.cc
by gs＠svn2.opensuse.org 16 Feb '11

16 Feb '11

Author: gs Date: Wed Feb 16 10:54:26 2011 New Revision: 63428 URL: http://svn.opensuse.org/viewcvs/yast?rev=63428&view=rev Log: NCMultiSelectionBox: adjust preferred width, avoid invalid pointers Modified: branches/SuSE-Code-11-SP2-Branch/ncurses/package/yast2-ncurses.changes branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCMultiSelectionBox.cc Modified: branches/SuSE-Code-11-SP2-Branch/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ncurs… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ncurses/package/yast2-ncurses.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/ncurses/package/yast2-ncurses.changes Wed Feb 16 10:54:26 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 16 10:51:16 CET 2011 - gs(a)suse.de + +- NCMultiSelectionBox: adjust preferred width, avoid invalid + pointers + +------------------------------------------------------------------- Wed Oct 13 14:26:38 CEST 2010 - gs(a)suse.de - NCRichText: bug-fix for pre tag (bnc #484629) Modified: branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCMultiSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ncurs… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCMultiSelectionBox.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCMultiSelectionBox.cc Wed Feb 16 10:54:26 2011 @@ -40,7 +40,8 @@ int NCMultiSelectionBox::preferredWidth() { - return wGetDefsze().W; + wsze sze = wGetDefsze(); + return sze.W > ( int )( labelWidth() + 2 ) ? sze.W : ( labelWidth() + 2 ); } @@ -77,7 +78,8 @@ void NCMultiSelectionBox::setCurrentItem( YItem * item ) { - myPad()->ScrlLine( item->index() ); + if ( item ) + myPad()->ScrlLine( item->index() ); } void NCMultiSelectionBox::addItem( YItem * item ) @@ -136,22 +138,27 @@ bool NCMultiSelectionBox::isItemSelected( YItem *item ) { - return item->selected(); + if ( item ) + return item->selected(); + else + return false; } void NCMultiSelectionBox::selectItem( YItem *yitem, bool selected ) { - YMultiSelectionBox::selectItem( yitem, selected ); - - //retrieve pointer to the line tag associated with this item - NCTableTag * tag = ( NCTableTag * )yitem->data(); - YUI_CHECK_PTR( tag ); + if ( yitem ) + { + YMultiSelectionBox::selectItem( yitem, selected ); - tag->SetSelected( selected ); + //retrieve pointer to the line tag associated with this item + NCTableTag * tag = ( NCTableTag * )yitem->data(); + YUI_CHECK_PTR( tag ); - DrawPad(); + tag->SetSelected( selected ); + DrawPad(); + } } @@ -162,6 +169,8 @@ for ( unsigned int i = 0; i < getNumLines(); i++ ) { NCTableTag *t = tagCell( i ); + YUI_CHECK_PTR( t ); + t->SetSelected( false ); } @@ -176,8 +185,8 @@ void NCMultiSelectionBox::toggleCurrentItem() { YItem *it = currentItem(); - selectItem( it, !( it->selected() ) ); - + if ( it ) + selectItem( it, !( it->selected() ) ); } -- 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] r63427 - /trunk/yast2/scripts/yast2
by aschnell＠svn2.opensuse.org 15 Feb '11

15 Feb '11

Author: aschnell Date: Tue Feb 15 17:47:07 2011 New Revision: 63427 URL: http://svn.opensuse.org/viewcvs/yast?rev=63427&view=rev Log: - changed snapper description text Modified: trunk/yast2/scripts/yast2 Modified: trunk/yast2/scripts/yast2 URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/yast2?rev=63427&r1… ============================================================================== --- trunk/yast2/scripts/yast2 (original) +++ trunk/yast2/scripts/yast2 Tue Feb 15 17:47:07 2011 @@ -215,7 +215,7 @@ { if [ "$1" != "menu" ] ; then if [ "$USE_SNAPPER" = "yes" -a -x $SNAPPERBIN ] ; then - SNAPSHOT_NUMBER=`$SNAPPERBIN create --type=pre --print-number --description="yast2 $1"` + SNAPSHOT_NUMBER=`$SNAPPERBIN create --type=pre --print-number --description="yast $1"` fi fi } -- 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] r63426 - /trunk/ldap-server/src/LdapServer.pm
by rhafer＠svn2.opensuse.org 15 Feb '11

15 Feb '11

Author: rhafer Date: Tue Feb 15 17:39:56 2011 New Revision: 63426 URL: http://svn.opensuse.org/viewcvs/yast?rev=63426&view=rev Log: Allow non-standard db-directory when creating the first database (bnc#669213) Modified: trunk/ldap-server/src/LdapServer.pm Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Tue Feb 15 17:39:56 2011 @@ -1696,7 +1696,7 @@ 'suffix' => $dbDefaults{'suffix'}, 'rootdn' => $dbDefaults{'rootdn'}, 'rootpw' => $pwHash, - 'directory' => '/var/lib/ldap', + 'directory' => $dbDefaults{'directory'}, 'entrycache' => YaST::YCP::Integer($dbDefaults{'entrycache'}), 'idlcache' => YaST::YCP::Integer($dbDefaults{'idlcache'}), 'checkpoint' => [ YaST::YCP::Integer($dbDefaults{'checkpoint'}->[0]), @@ -1755,6 +1755,20 @@ return $rc; } + if ( ! defined SCR->Read(".target.dir", $database->{directory}) ) { + my $ret = SCR->Execute(".target.bash", "mkdir -m 0700 -p ".$database->{directory}); + if( ( $ret ) && ( ! defined SCR->Read(".target.dir", $database->{directory}) ) ) { + $self->SetError(_("Could not create database directory."), ""); + return $ret; + } + my $owner = SCR->Read('.sysconfig.openldap.OPENLDAP_USER'); + my $group = SCR->Read('.sysconfig.openldap.OPENLDAP_GROUP'); + $ret = SCR->Execute(".target.bash", "chown ".$owner.":".$group." ".$database->{directory}); + if ( $ret ) { + $self->SetError(_("Could adjust ownership of database directory."), ""); + return $ret; + } + } SCR->Execute('.ldapserver.initDatabases', [ $frontenddb, $cfgdatabase, $database ] ); if ( $dbDefaults{'defaultIndex'} == 1 || ( ref($dbDefaults{'defaultIndex'}) eq "YaST::YCP::Boolean" && -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0