Author: rhafer Date: Thu Jul 22 12:07:55 2010 New Revision: 62287 URL: http://svn.opensuse.org/viewcvs/yast?rev=62287&view=rev Log: Merged bnc#619549 fix from trunk Modified: branches/SuSE-Linux-11_3-Branch/ldap-server/ (props changed) branches/SuSE-Linux-11_3-Branch/ldap-server/src/LdapServer.pm Modified: branches/SuSE-Linux-11_3-Branch/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/ldap-server/src/LdapServer.pm?rev=62287&r1=62286&r2=62287&view=diff ============================================================================== --- branches/SuSE-Linux-11_3-Branch/ldap-server/src/LdapServer.pm (original) +++ branches/SuSE-Linux-11_3-Branch/ldap-server/src/LdapServer.pm Thu Jul 22 12:07:55 2010 @@ -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