Author: rhafer Date: Thu Jun 16 13:23:40 2011 New Revision: 64406 URL: http://svn.opensuse.org/viewcvs/yast?rev=64406&view=rev Log: New Class for handling "olcServerId" Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/lib/slapd-config.cpp branches/SuSE-Code-11-SP2-Branch/ldap-server/src/lib/slapd-config.h Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/lib/slapd-config.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-server/src/lib/slapd-config.cpp?rev=64406&r1=64405&r2=64406&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/src/lib/slapd-config.cpp (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/src/lib/slapd-config.cpp Thu Jun 16 13:23:40 2011 @@ -1325,7 +1325,42 @@ } } +OlcServerId::OlcServerId( const std::string &idVal ) +{ + std::istringstream serverIdStr( idVal ); + + serverIdStr >> serverId; + serverIdStr >> serverUri; +} + +std::string OlcServerId::toStringVal() const +{ + std::ostringstream ostr; + ostr << serverId << " " << serverUri; + + return ostr.str(); +} + +int OlcServerId::getServerId() const +{ + return serverId; +} + +std::string OlcServerId::getServerUri() const +{ + return serverUri; +} + +void OlcServerId::setServerId( int id ) +{ + serverId = id; +} + +void OlcServerId::setServerUri( const std::string &uri ) +{ + serverUri = uri; +} OlcDatabase::OlcDatabase( const LDAPEntry& le=LDAPEntry()) : OlcConfigEntry(le) { @@ -1956,6 +1991,37 @@ tls.applySettings( *this ); } +const std::vector<OlcServerId> OlcGlobalConfig::getServerIds() const +{ + const StringList values = this->getStringValues("olcServerId"); + + std::vector<OlcServerId> v_serverIds; + StringList::const_iterator i; + for ( i = values.begin(); i != values.end(); i++ ) + { + v_serverIds.push_back( OlcServerId(*i) ); + } + return v_serverIds; +} + +void OlcGlobalConfig::setServerIds(const std::vector<OlcServerId> &serverIds) +{ + StringList values; + + std::vector<OlcServerId>::const_iterator i; + + for ( i = serverIds.begin(); i != serverIds.end(); i++ ) + { + values.add( i->toStringVal() ); + } + this->setStringValues( "olcServerId", values ); +} + +void OlcGlobalConfig::addServerId(const OlcServerId &serverId) +{ + this->addStringValue( "olcServerId", serverId.toStringVal() ); +} + const std::string OlcSchemaConfig::schemabase = "cn=schema,cn=config"; OlcSchemaConfig::OlcSchemaConfig() : OlcConfigEntry() Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/lib/slapd-config.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-server/src/lib/slapd-config.h?rev=64406&r1=64405&r2=64406&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/src/lib/slapd-config.h (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/src/lib/slapd-config.h Thu Jun 16 13:23:40 2011 @@ -337,6 +337,24 @@ std::map secMap; }; +class OlcServerId +{ + public: + OlcServerId( const std::string &idVal ); + OlcServerId( int id, const std::string &uri ) : serverId( id ), serverUri( uri ) {} + + std::string toStringVal() const; + int getServerId() const; + std::string getServerUri() const; + + void setServerId( int id ); + void setServerUri( const std::string &uri ); + + private: + int serverId; + std::string serverUri; +}; + typedef std::list OlcOverlayList; typedef std::list OlcAccessList; typedef std::list OlcLimitList; @@ -423,6 +441,10 @@ OlcTlsSettings getTlsSettings() const; void setTlsSettings( const OlcTlsSettings& tls); + + const std::vector<OlcServerId> getServerIds() const; + void setServerIds(const std::vector<OlcServerId> &serverIds); + void addServerId(const OlcServerId &serverId); }; class OlcSchemaConfig : public OlcConfigEntry -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org