Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
OpenLDAP
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Thierry Pubellier
OpenLDAP
Commits
ef456f1e
Commit
ef456f1e
authored
26 years ago
by
Kurt Zeilenga
Browse files
Options
Downloads
Patches
Plain Diff
Import ldap session default init changes.
parent
bec1795b
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CHANGES
+3
-2
3 additions, 2 deletions
CHANGES
doc/man/man5/ldap.conf.5
+22
-8
22 additions, 8 deletions
doc/man/man5/ldap.conf.5
libraries/libldap/init.c
+15
-3
15 additions, 3 deletions
libraries/libldap/init.c
tests/Makefile.in
+1
-1
1 addition, 1 deletion
tests/Makefile.in
with
41 additions
and
14 deletions
CHANGES
+
3
−
2
View file @
ef456f1e
...
...
@@ -7,13 +7,14 @@ Changes included in OpenLDAP 1.1.x
Fixed slapd/delete bugs (ITS#39)
Fixed slapd/strtok needs mutex bug
Fixed slapd/tcpd DoS bug
Fixed ud bogus msgfree bug (ITS#43)
Fixed slapd/add,delete,modrdn parent lock bug
Fixed ud bogus msgfree bug (ITS#43)
Updated ldap.conf to support LDAPNOINIT
Updated lthread to provide sched_yield() if missing
Updated slapd/modrdn ACL handling
Updated slapd/search deallocation
Updated slapd to use pthread_detach()
Updated slapd thread initialization
Updated lthread to provide sched_yield() if missing
Updated slapd shutdown code to use condition wait
Build environment
Added DB2 patch information
...
...
This diff is collapsed.
Click to expand it.
doc/man/man5/ldap.conf.5
+
22
−
8
View file @
ef456f1e
...
...
@@ -10,15 +10,25 @@ The
configuration file is used to set system-wide defaults to be applied when
running
.I ldap
clients.
Note that each user may specify an optional configuration file,
clients. If the environment variable \fBLDAPNOINIT\fP is defined, all
defaulting is disabled.
.LP
Each user may specify an optional configuration file,
.IR .ldaprc ,
in his/her home directory which will be used to override system-wide
defaults file. The user may also provide a local configuration
file
.I ldaprc
which will be used to override per-user and system-wide defaults.
Environmental variables may be used to file based defaults.
in his/her home directory which will be used to override the system-wide
defaults file.
.LP
Additional configuration files can be specified using
the \fBLDAPCONF\fP and \fBLDAPRC\fP environment variables.
\fBLDAPCONF\fP may be set the path of a configuration file. This
patch can be absolute or relative to current working directory.
The \fBLDAPRC\fP, if defined, should be a basename of a file
in the current working directory or in the user's home directory.
.LP
Environmental variables may also be used to augment the file based defaults.
The name of the option is the as listed but with a prefix of \fBLDAP\fP.
For example, to define \fBBASE\fP via the environment, define the variable
\fBLDAPBASE\fP to desired value.
.SH OPTIONS
The different configuration options are:
.TP 1i
...
...
@@ -61,6 +71,10 @@ dereferenced when searching, or dereferenced only when locating the
base object for the search. The default is to never dereference aliases.
.SH FILES
.I ETCDIR/ldap.conf
.LP
.I $HOME/.ldaprc
.LP
.I $CWD/.ldaprc
.SH "SEE ALSO"
ldap(3)
.SH AUTHOR
...
...
This diff is collapsed.
Click to expand it.
libraries/libldap/init.c
+
15
−
3
View file @
ef456f1e
...
...
@@ -267,18 +267,30 @@ void openldap_ldap_initialize( void )
gopts
.
ldo_defhost
=
ldap_strdup
(
"localhost"
);
gopts
.
ldo_defport
=
LDAP_PORT
;
openldap_ldap_initialized
=
1
;
if
(
getenv
(
"LDAPNOINIT"
)
!=
NULL
)
{
return
;
}
openldap_ldap_init_w_conf
(
DEFAULT_LDAP_CONF_FILE
);
openldap_ldap_init_w_userconf
(
DEFAULT_LDAP_USERRC_FILE
);
{
char
*
altfile
=
getenv
(
"LDAP
R
C"
);
char
*
altfile
=
getenv
(
"LDAPC
ONF
"
);
if
(
altfile
!=
NULL
)
{
openldap_ldap_init_w_conf
(
altfile
);
}
}
openldap_ldap_init_w_env
(
NULL
);
{
char
*
altfile
=
getenv
(
"LDAPRC"
);
openldap_ldap_initialized
=
1
;
if
(
altfile
!=
NULL
)
{
openldap_ldap_init_w_userconf
(
altfile
);
}
}
openldap_ldap_init_w_env
(
NULL
);
}
This diff is collapsed.
Click to expand it.
tests/Makefile.in
+
1
−
1
View file @
ef456f1e
...
...
@@ -13,6 +13,6 @@ clean-local: FORCE
$(
RM
)
test-db/[!C]
*
test-repl/[!C]
*
*
core
veryclean-local
:
FORCE
$(
RM
)
-f
data
@
-
$(
RM
)
data
$(
RM
)
-r
test-db test-repl
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment