02224ae210
The integration layer is the place to put StarlingX changes Signed-off-by: Saul Wold <sgw@linux.intel.com>
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From 8196f53139c4d7e6c1cb8508d1a421299f7eaa61 Mon Sep 17 00:00:00 2001
|
|
From: babak sarashki <babak.sarashki@windriver.com>
|
|
Date: Sun, 3 Nov 2019 15:14:39 -0800
|
|
Subject: [PATCH 16/20] openldap man ldap conf
|
|
|
|
From Stx 1901: openldap-man-ldap-conf.patch
|
|
|
|
This patch makes clear what is the actual behavior in RHEL due to bug #38402.
|
|
|
|
Author: Matus Honek <mhonek@redhat.com>
|
|
Resolves: #1498841
|
|
---
|
|
doc/man/man5/ldap.conf.5 | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/doc/man/man5/ldap.conf.5 b/doc/man/man5/ldap.conf.5
|
|
index 313b9c2..904bf24 100644
|
|
--- a/doc/man/man5/ldap.conf.5
|
|
+++ b/doc/man/man5/ldap.conf.5
|
|
@@ -25,7 +25,7 @@ in their home directory which will be used to override the system-wide
|
|
defaults file.
|
|
The file
|
|
.I ldaprc
|
|
-in the current working directory is also used.
|
|
+in the current working directory is \fBNOT\fP used (this differs from upstream).
|
|
.LP
|
|
.LP
|
|
Additional configuration files can be specified using
|
|
@@ -50,7 +50,7 @@ Thus the following files and variables are read, in order:
|
|
.nf
|
|
variable $LDAPNOINIT, and if that is not set:
|
|
system file ETCDIR/ldap.conf,
|
|
- user files $HOME/ldaprc, $HOME/.ldaprc, ./ldaprc,
|
|
+ user files $HOME/ldaprc, $HOME/.ldaprc, (\fBNOT\fP ./ldaprc, see above),
|
|
system file $LDAPCONF,
|
|
user files $HOME/$LDAPRC, $HOME/.$LDAPRC, ./$LDAPRC,
|
|
variables $LDAP<uppercase option name>.
|
|
--
|
|
2.17.1
|
|
|