diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-07-16 17:26:01 +0000 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-07-16 17:26:01 +0000 |
| commit | 2ac300ccc25b3bc3ade6f4a840c4640fddbdb379 (patch) | |
| tree | 2cd768d48c985303d9dbcc682ee2c1937058b6d9 | |
| parent | 3729eac5108ceeaae6ff1dab615e0ad8cf45151d (diff) | |
| download | libtdeldap-2ac300ccc25b3bc3ade6f4a840c4640fddbdb379.tar.gz libtdeldap-2ac300ccc25b3bc3ade6f4a840c4640fddbdb379.zip | |
Do not replicate olcGlobal by default
| -rw-r--r-- | src/libtdeldap.cpp | 5 | ||||
| -rw-r--r-- | src/libtdeldap.h | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/libtdeldap.cpp b/src/libtdeldap.cpp index 4d95d79..fd14928 100644 --- a/src/libtdeldap.cpp +++ b/src/libtdeldap.cpp @@ -3260,7 +3260,7 @@ int LDAPManager::setLDAPMasterReplicationSettings(LDAPMasterReplicationInfo repl TQString databaseDN; ridString.sprintf("%03d", rid); databaseDN = "cn=config"; - serverSyncReplString = TQString("rid=%1 provider=ldaps://%2/ binddn=\"%3\" bindmethod=simple credentials=\"%4\" searchbase=\"%5\" filter=\"(objectClass=*)\" type=refreshAndPersist scope=\"sub\" attrs=\"*,+\" schemachecking=off retry=\"%5\" timeout=%6 tls_reqcert=%6").arg(ridString).arg((*it).fqdn).arg(replicationinfo.syncDN).arg(replicationinfo.syncPassword).arg(databaseDN).arg(replicationinfo.retryMethod).arg(replicationinfo.timeout).arg((replicationinfo.ignore_ssl_failure)?"never":"demand"); + serverSyncReplString = TQString("rid=%1 provider=ldaps://%2/ binddn=\"%3\" bindmethod=simple credentials=\"%4\" searchbase=\"%5\" filter=\"%6\" type=refreshAndPersist scope=\"sub\" attrs=\"*,+\" schemachecking=off retry=\"%7\" timeout=%8 tls_reqcert=%9").arg(ridString).arg((*it).fqdn).arg(replicationinfo.syncDN).arg(replicationinfo.syncPassword).arg(databaseDN).arg((replicationinfo.replicate_olcGlobal)?"(objectClass=*)":"(&(objectclass=*)(!(objectclass=olcGlobal)))").arg(replicationinfo.retryMethod).arg(replicationinfo.timeout).arg((replicationinfo.ignore_ssl_failure)?"never":"demand"); if (replicationinfo.certificateFile != "") { serverSyncReplString.append(TQString(" tls_cert=\"%1\"").arg(replicationinfo.certificateFile)); } @@ -3307,7 +3307,7 @@ int LDAPManager::setLDAPMasterReplicationSettings(LDAPMasterReplicationInfo repl TQString databaseDN; ridString.sprintf("%03d", rid); databaseDN = m_basedc; - serverSyncReplString = TQString("rid=%1 provider=ldaps://%2/ binddn=\"%3\" bindmethod=simple credentials=\"%4\" searchbase=\"%5\" filter=\"(objectClass=*)\" type=refreshAndPersist scope=\"sub\" attrs=\"*,+\" schemachecking=off retry=\"%5\" timeout=%6 tls_reqcert=%6").arg(ridString).arg((*it).fqdn).arg(replicationinfo.syncDN).arg(replicationinfo.syncPassword).arg(databaseDN).arg(replicationinfo.retryMethod).arg(replicationinfo.timeout).arg((replicationinfo.ignore_ssl_failure)?"never":"demand"); + serverSyncReplString = TQString("rid=%1 provider=ldaps://%2/ binddn=\"%3\" bindmethod=simple credentials=\"%4\" searchbase=\"%5\" filter=\"%6\" type=refreshAndPersist scope=\"sub\" attrs=\"*,+\" schemachecking=off retry=\"%7\" timeout=%8 tls_reqcert=%9").arg(ridString).arg((*it).fqdn).arg(replicationinfo.syncDN).arg(replicationinfo.syncPassword).arg(databaseDN).arg((replicationinfo.replicate_olcGlobal)?"(objectClass=*)":"(&(objectclass=*)(!(objectclass=olcGlobal)))").arg(replicationinfo.retryMethod).arg(replicationinfo.timeout).arg((replicationinfo.ignore_ssl_failure)?"never":"demand"); if (replicationinfo.certificateFile != "") { serverSyncReplString.append(TQString(" tls_cert=\"%1\"").arg(replicationinfo.certificateFile)); } @@ -4390,6 +4390,7 @@ LDAPMasterReplicationInfo::LDAPMasterReplicationInfo() { retryMethod = "5 5 300 5 600 +"; timeout = 1; ignore_ssl_failure = false; + replicate_olcGlobal = false; } LDAPMasterReplicationInfo::~LDAPMasterReplicationInfo() { diff --git a/src/libtdeldap.h b/src/libtdeldap.h index c3d58f0..cde314c 100644 --- a/src/libtdeldap.h +++ b/src/libtdeldap.h @@ -405,6 +405,7 @@ class LDAPMasterReplicationInfo TQString certificateFile; TQString caCertificateFile; bool ignore_ssl_failure; + bool replicate_olcGlobal; }; class KerberosTicketInfo @@ -540,4 +541,4 @@ class LDAPManager : public TQObject { LDAP *m_ldap; }; -#endif // _LIBTDELDAP_H_
\ No newline at end of file +#endif // _LIBTDELDAP_H_ |