Author: rhafer Date: Fri Apr 1 16:30:32 2011 New Revision: 63697 URL: http://svn.opensuse.org/viewcvs/yast?rev=63697&view=rev Log: Create LDAP base object after writing /etc/openldap/ldap.conf to avoid libldap initialization issues (bnc#619549) (Merged from trunk r62285) 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=63697&r1=63696&r2=63697&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:30:32 2011 @@ -799,11 +799,6 @@ return 0; } Progress->NextStage(); - $self->CreateBaseObjects(); - if ( $setupSyncreplMaster ) - { - $self->CreateSyncReplAccount(); - } if ( $write_ldapconf ) { y2milestone("Updating /etc/openldap/ldap.conf"); @@ -819,6 +814,11 @@ } SCR->Write(".etc.ldap_conf", "force" ); } + $self->CreateBaseObjects(); + if ( $setupSyncreplMaster ) + { + $self->CreateSyncReplAccount(); + } if (! $usesBackConfig ) { SCR->Execute('.target.bash', 'cp -f /etc/openldap/slapd.conf /etc/openldap/slapd.conf.YaSTsave' ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org