Author: rhafer
Date: Tue Jun 7 16:45:32 2011
New Revision: 64261
URL: http://svn.opensuse.org/viewcvs/yast?rev=64261&view=rev
Log:
Getter/Setter for various syncrepl timeouts
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=64261&r1=64260&r2=64261&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 Tue Jun 7 16:45:32 2011
@@ -927,10 +927,14 @@
const std::string OlcSyncRepl::STARTTLS="starttls";
const std::string OlcSyncRepl::RETRY="retry";
const std::string OlcSyncRepl::TLS_REQCERT="tls_reqcert";
+const std::string OlcSyncRepl::TIMEOUT="timeout";
+const std::string OlcSyncRepl::NETWORK_TIMEOUT="network-timeout";
OlcSyncRepl::OlcSyncRepl( const std::string &syncreplLine):
- rid(1),
+ rid(1),
bindmethod("simple"),
+ networkTimeout(0),
+ timeout(0),
starttls( OlcSyncRepl::StartTlsNo )
{
log_it(SLAPD_LOG_DEBUG, "OlcSyncRepl::OlcSyncRepl(" + syncreplLine + ")");
@@ -1029,6 +1033,16 @@
{
this->setTlsReqCert(value);
}
+ else if ( key == NETWORK_TIMEOUT )
+ {
+ std::istringstream s(value);
+ s >> networkTimeout;
+ }
+ else if ( key == TIMEOUT )
+ {
+ std::istringstream s(value);
+ s >> timeout;
+ }
else
{
otherValues.push_back(make_pair(key, value));
@@ -1070,6 +1084,15 @@
<< "binddn=\"" << this->binddn << "\" "
<< "credentials=\"" << this->credentials << "\"";
+ if ( this->networkTimeout )
+ {
+ srlStream << " network-timeout=" << this->networkTimeout;
+ }
+ if ( this->timeout )
+ {
+ srlStream << " timeout=" << this->timeout;
+ }
+
std::vector