mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-04 01:37:34 -08:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
58 lines
2.7 KiB
Diff
58 lines
2.7 KiB
Diff
diff -Nuar --exclude '*.orig' nss_ldap-265.orig/ldap.conf nss_ldap-265/ldap.conf
|
|
--- nss_ldap-265.orig/ldap.conf 2009-11-06 10:28:08.000000000 +0000
|
|
+++ nss_ldap-265/ldap.conf 2010-02-19 18:36:58.272236290 +0000
|
|
@@ -279,7 +279,8 @@
|
|
# OpenLDAP SSL mechanism
|
|
# start_tls mechanism uses the normal LDAP port, LDAPS typically 636
|
|
#ssl start_tls
|
|
-#ssl on
|
|
+###ssl on
|
|
+# Gentoo note: Don't use 'ssl on' in 249/250. They are broken in some cases! Use start_tls instead.
|
|
|
|
# OpenLDAP SSL options
|
|
# Require and verify server certificate (yes/no)
|
|
@@ -311,3 +312,27 @@
|
|
# Override the default Kerberos ticket cache location.
|
|
#krb5_ccname FILE:/etc/.ldapcache
|
|
|
|
+# Timeout behavior
|
|
+# Upstream nss_ldap hard-codes these values:
|
|
+#nss_reconnect_tries 5 # number of times to double the sleep time
|
|
+#nss_reconnect_sleeptime 4 # initial sleep value
|
|
+#nss_reconnect_maxsleeptime 64 # max sleep value to cap at
|
|
+#nss_reconnect_maxconntries 2 # how many tries before sleeping
|
|
+# This leads to a delay of 124 seconds (4+8+16+32+64=124) per lookup if the
|
|
+# server is not available.
|
|
+
|
|
+# For Gentoo's distribution of nss_ldap, as of 250-r1, we use these values
|
|
+# (The hardwired constants in the code are changed to them as well):
|
|
+nss_reconnect_tries 4 # number of times to double the sleep time
|
|
+nss_reconnect_sleeptime 1 # initial sleep value
|
|
+nss_reconnect_maxsleeptime 16 # max sleep value to cap at
|
|
+nss_reconnect_maxconntries 2 # how many tries before sleeping
|
|
+# This leads to a delay of 15 seconds (1+2+4+8=15)
|
|
+
|
|
+# If you are impatient, and know your LDAP server is reliable, fast or local,
|
|
+# you may wish to use these values instead:
|
|
+#nss_reconnect_tries 1 # number of times to double the sleep time
|
|
+#nss_reconnect_sleeptime 1 # initial sleep value
|
|
+#nss_reconnect_maxsleeptime 1 # max sleep value to cap at
|
|
+#nss_reconnect_maxconntries 3 # how many tries before sleeping
|
|
+# This leads to a delay of 1 second.
|
|
diff -Nuar --exclude '*.orig' nss_ldap-265.orig/ldap-nss.h nss_ldap-265/ldap-nss.h
|
|
--- nss_ldap-265.orig/ldap-nss.h 2009-11-06 10:28:08.000000000 +0000
|
|
+++ nss_ldap-265/ldap-nss.h 2010-02-19 18:37:49.278474888 +0000
|
|
@@ -96,9 +96,9 @@
|
|
* unacceptable, in which case you may wish to adjust
|
|
* the constants below.
|
|
*/
|
|
-#define LDAP_NSS_TRIES 5 /* number of sleeping reconnect attempts */
|
|
-#define LDAP_NSS_SLEEPTIME 4 /* seconds to sleep; doubled until max */
|
|
-#define LDAP_NSS_MAXSLEEPTIME 64 /* maximum seconds to sleep */
|
|
+#define LDAP_NSS_TRIES 4 /* number of sleeping reconnect attempts */
|
|
+#define LDAP_NSS_SLEEPTIME 1 /* seconds to sleep; doubled until max */
|
|
+#define LDAP_NSS_MAXSLEEPTIME 16 /* maximum seconds to sleep */
|
|
#define LDAP_NSS_MAXCONNTRIES 2 /* reconnect attempts before sleeping */
|
|
|
|
#if defined(HAVE_NSSWITCH_H) || defined(HAVE_IRS_H)
|