Import ldap session default init changes.

diff --git a/CHANGES b/CHANGES
index 5c5392d58fb1f8b6b99f0fa93f1a0429f92858c0..aafe99bee9a0c28d54ee87d98fcc4138d0b532a3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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

diff --git a/doc/man/man5/ldap.conf.5 b/doc/man/man5/ldap.conf.5
index 26c0781dc67d87d81935bf8641af193e3d77cb21..9904ece2fdc2589a57b72a6e51793ef31a12ff4e 100644 (file)
--- a/doc/man/man5/ldap.conf.5
+++ b/doc/man/man5/ldap.conf.5
@@ -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

diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
index 4ff58daf2e5c3d9b1f8cda67fbc6d073945e34a6..cc8588d712a138b36c83c8056a9b137746731d77 100644 (file)
--- a/libraries/libldap/init.c
+++ b/libraries/libldap/init.c
@@ -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("LDAPRC");
+               char *altfile = getenv("LDAPCONF");
 
                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);
 }

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 2c8adfc82dc6de9f676a88185a08faccdd910a0a..fda33ec0b49384b5aef2a4225908131dafa5be1b 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -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