Author: rhafer Date: Wed Sep 3 14:00:07 2008 New Revision: 50610 URL: http://svn.opensuse.org/viewcvs/yast?rev=50610&view=rev Log: - Schema Entries have an Index as well - make default logging less verbose Modified: trunk/ldap-server/src/lib/slapd-config.cpp trunk/ldap-server/src/lib/slapd-config.h Modified: trunk/ldap-server/src/lib/slapd-config.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/slapd-config.cpp?rev=50610&r1=50609&r2=50610&view=diff ============================================================================== --- trunk/ldap-server/src/lib/slapd-config.cpp (original) +++ trunk/ldap-server/src/lib/slapd-config.cpp Wed Sep 3 14:00:07 2008 @@ -299,7 +299,7 @@ StringList::const_iterator k = i->getValues().begin(); for( ; k != i->getValues().end(); k++ ) { if ( *k == *j ) { - log_it(SLAPD_LOG_INFO,"Value unchanged: " + *k ); + log_it(SLAPD_LOG_DEBUG,"Value unchanged: " + *k ); added = false; break; } @@ -343,7 +343,7 @@ i = m_dbEntryChanged.getAttributes()->begin(); for(; i != m_dbEntryChanged.getAttributes()->end(); i++ ) { - log_it(SLAPD_LOG_INFO,i->getName() ); + log_it(SLAPD_LOG_DEBUG,i->getName() ); const LDAPAttribute *old = m_dbEntry.getAttributeByName(i->getName()); if (! old ) { log_it(SLAPD_LOG_INFO,"Attribute added: " + i->getName()); @@ -1262,6 +1262,21 @@ entryIndex = splitIndexFromString( name, m_name ); } +void OlcSchemaConfig::updateEntryDn(bool origEntry ) +{ + log_it(SLAPD_LOG_INFO, "updateEntryDN()"); + std::ostringstream dn, name; + name << "{" << entryIndex << "}" << m_name; + dn << "cn=" << name.str() << "," << "cn=schema,cn=config"; + m_dbEntryChanged.setDN(dn.str()); + m_dbEntryChanged.replaceAttribute(LDAPAttribute("cn", name.str())); + if ( origEntry && (! m_dbEntry.getDN().empty()) ) + { + m_dbEntry.setDN(dn.str()); + m_dbEntry.replaceAttribute(LDAPAttribute("cn", name.str())); + } +} + OlcTlsSettings::OlcTlsSettings( const OlcGlobalConfig &ogc ) : m_crlCheck(0), m_verifyCient(0) { @@ -1427,6 +1442,8 @@ { try { bool reread = true; + log_it(SLAPD_LOG_INFO, "updateEntry() Old DN: "+oce.getDn()+" ChangedDN: "+ oce.getChangedEntry().getDN() ); +// log_it(SLAPD_LOG_INFO, " LDIF "+oce.toLdif() ); if ( oce.isNewEntry () ) { m_lc->add(&oce.getChangedEntry()); @@ -1438,14 +1455,14 @@ if ( ! ml.empty() ) { m_lc->modify( oce.getDn(), &ml ); } else { - log_it(SLAPD_LOG_INFO,oce.getDn() + ": no changes" ); + log_it(SLAPD_LOG_INFO, oce.getDn() + ": no changes" ); reread = false; } } // re-read Entry from Server if ( reread ) { - LDAPSearchResults *sr = m_lc->search( oce.getDn(), LDAPConnection::SEARCH_BASE); + LDAPSearchResults *sr = m_lc->search( oce.getUpdatedDn(), LDAPConnection::SEARCH_BASE); LDAPEntry *e = sr->getNext(); if ( e ) { log_it(SLAPD_LOG_INFO,"Re-read Entry " + e->getDN() ); Modified: trunk/ldap-server/src/lib/slapd-config.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/slapd-config.h?rev=50610&r1=50609&r2=50610&view=diff ============================================================================== --- trunk/ldap-server/src/lib/slapd-config.h (original) +++ trunk/ldap-server/src/lib/slapd-config.h Wed Sep 3 14:00:07 2008 @@ -262,6 +262,9 @@ const std::string& getName() const; const std::vector<LDAPAttrType> getAttributeTypes() const; + protected: + virtual void updateEntryDn( bool origEntry = false); + private: virtual void resetMemberAttrs(); std::string m_name; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org