From ec56341343dfcd526d483dd4a33801d23511f581 Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount <quanah@openldap.org> Date: Sat, 27 Jun 2009 20:45:35 +0000 Subject: [PATCH] ITS#5829 --- CHANGES | 2 ++ build/man.mk | 1 + doc/man/man5/slapd-config.5 | 2 ++ doc/man/man5/slapd.conf.5 | 2 ++ 4 files changed, 7 insertions(+) diff --git a/CHANGES b/CHANGES index 422bb19460..e24d008ba2 100644 --- a/CHANGES +++ b/CHANGES @@ -67,7 +67,9 @@ OpenLDAP 2.4.17 Engineering ldap_result(3) Add RETURN VALUE heading (ITS#6180) ldap.conf(5) improve sizelimit/timelimit limits (ITS#6127) slapd.access(5) Fix <setstyle> to use expand (ITS#6179) + slapd.conf(5) document default modulepath (ITS#5829) slapd.conf(5) pidfile/argsfile description fix (ITS#5975) + slapd-config(5) document default modulepath (ITS#5829) slapd-config(5) pidfile/argsfile description fix (ITS#5975) slapo-constraint(5) clarify URI example (ITS#6118) slapo-unique(5) explicitly note rootdn requirement (ITS#6108) diff --git a/build/man.mk b/build/man.mk index fd1bfb409a..94f4c95477 100644 --- a/build/man.mk +++ b/build/man.mk @@ -31,6 +31,7 @@ all-common: -e 's%BINDIR%$(bindir)%' \ -e 's%LIBDIR%$(libdir)%' \ -e 's%LIBEXECDIR%$(libexecdir)%' \ + -e 's%MODULEDIR%$(moduledir)%' \ -e 's%RELEASEDATE%$(RELEASEDATE)%' \ $(srcdir)/$$page \ | (cd $(srcdir); $(SOELIM) -) > $$page.$(TMP_SUFFIX); \ diff --git a/doc/man/man5/slapd-config.5 b/doc/man/man5/slapd-config.5 index c95c2a87ac..9c7e24ecbe 100644 --- a/doc/man/man5/slapd-config.5 +++ b/doc/man/man5/slapd-config.5 @@ -913,6 +913,8 @@ option. .B olcModulePath: <pathspec> Specify a list of directories to search for loadable modules. Typically the path is colon-separated but this depends on the operating system. +The default is MODULEDIR, which is where the standard OpenLDAP install +will place its modules. .SH SCHEMA OPTIONS Schema definitions are created as entries in the .B cn=schema,cn=config diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5 index 3b23fd688d..4ab3ce167a 100644 --- a/doc/man/man5/slapd.conf.5 +++ b/doc/man/man5/slapd.conf.5 @@ -685,6 +685,8 @@ option are only usable if slapd was compiled with \-\-enable\-modules. .B modulepath <pathspec> Specify a list of directories to search for loadable modules. Typically the path is colon-separated but this depends on the operating system. +The default is MODULEDIR, which is where the standard OpenLDAP install +will place its modules. .HP .hy 0 .B objectclass "(\ <oid>\ -- GitLab