Author: rhafer Date: Fri Apr 1 16:35:03 2011 New Revision: 63699 URL: http://svn.opensuse.org/viewcvs/yast?rev=63699&view=rev Log: Allow non-standard db-directory when creating the first database (bnc#669213) (merged from trunk r63426) Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/ (props changed) branches/SuSE-Code-11-SP2-Branch/ldap-server/src/LdapServer.pm Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-server/src/LdapServer.pm?rev=63699&r1=63698&r2=63699&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/src/LdapServer.pm (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/src/LdapServer.pm Fri Apr 1 16:35:03 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@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org