[yast-commit] r58945 - in /branches/SuSE-Code-11-SP1-Branch/ldap-server/src: agent/SlapdConfigAgent.cc lib/slapd-config.cpp lib/slapd-config.h
![](https://seccdn.libravatar.org/avatar/0dddba71f3ed8a18896e852e75c1a9e5.jpg?s=120&d=mm&r=g)
Author: rhafer Date: Mon Oct 5 17:00:14 2009 New Revision: 58945 URL: http://svn.opensuse.org/viewcvs/yast?rev=58945&view=rev Log: Pass overlay's objectclass as an argument in constructor Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/agent/SlapdConfigAgent.cc branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.cpp branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.h Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-server/src/agent/SlapdConfigAgent.cc?rev=58945&r1=58944&r2=58945&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/agent/SlapdConfigAgent.cc Mon Oct 5 17:00:14 2009 @@ -1265,7 +1265,7 @@ if ( j == overlays.end() ) { y2milestone("New Overlay added"); - boost::shared_ptr<OlcOverlay> tmp(new OlcOverlay("ppolicy", (*i)->getUpdatedDn())); + boost::shared_ptr<OlcOverlay> tmp(new OlcOverlay("ppolicy", (*i)->getUpdatedDn(), "olcPPolicyConfig") ); ppolicyOlc = tmp; ppolicyOlc->setIndex( overlays.size() ); (*i)->addOverlay(ppolicyOlc); Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.cpp?rev=58945&r1=58944&r2=58945&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.cpp (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.cpp Mon Oct 5 17:00:14 2009 @@ -371,13 +371,16 @@ entryIndex = splitIndexFromString( type, m_type ); } -OlcOverlay::OlcOverlay( const std::string &type, const std::string &parent ) +OlcOverlay::OlcOverlay( const std::string &type, const std::string &parent, const std::string &oc ) : m_type(type), m_parent(parent) { std::ostringstream dnstr; dnstr << "olcOverlay=" << m_type << "," << parent; m_dbEntryChanged.setDN(dnstr.str()); - m_dbEntryChanged.addAttribute(LDAPAttribute("objectclass", "olcPpolicyConfig")); + if ( !oc.empty() ) + { + m_dbEntryChanged.addAttribute( LDAPAttribute("objectclass", oc) ); + } m_dbEntryChanged.addAttribute(LDAPAttribute("olcoverlay", m_type)); } Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.h?rev=58945&r1=58944&r2=58945&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.h (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.h Mon Oct 5 17:00:14 2009 @@ -110,7 +110,7 @@ public: static OlcOverlay* createFromLdapEntry( const LDAPEntry& le); OlcOverlay( const LDAPEntry &le ); - OlcOverlay( const std::string &type, const std::string &parent ); + OlcOverlay( const std::string &type, const std::string &parent, const std::string &oc="" ); const std::string getType() const; void newParentDn( const std::string &parent ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
rhafer@svn.opensuse.org