Merge remote-tracking branch 'origin/mdb.master'

[openldap] / doc / man / man8 / slapd.8

diff --git a/doc/man/man8/slapd.8 b/doc/man/man8/slapd.8
index 28f91254a8f22ca3424257719c58e79db108f463..00bc9de3c6288354d5a487b4f74ab7ab186b79d4 100644 (file)
--- a/doc/man/man8/slapd.8
+++ b/doc/man/man8/slapd.8
@@ -1,5 +1,5 @@
 .TH SLAPD 8C "RELEASEDATE" "OpenLDAP LDVERSION"
-.\" Copyright 1998-2009 The OpenLDAP Foundation All Rights Reserved.
+.\" Copyright 1998-2012 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
 .\" $OpenLDAP$
 .SH NAME
@@ -9,7 +9,8 @@ slapd \- Stand-alone LDAP Daemon
 [\c
 .BR \-4 | \-6 ]
 [\c
-.BR \-T \ { acl \||\| a [ dd ]\||\| auth \||\| c [ at ]\||\| d [ n ]\||\| i [ ndex ]\||\| p [ asswd ]\||\| t [ est ]}]
+.BR \-T \ { acl \||\| a [ dd ]\||\| auth \||\| c [ at ]\||\|
+.BR d [ n ]\||\| i [ ndex ]\||\| p [ asswd ]\||\| s [ chema ]\||\| t [ est ]}]
 [\c
 .BI \-d \ debug-level\fR]
 [\c
@@ -73,13 +74,14 @@ Listen on IPv4 addresses only.
 .B \-6
 Listen on IPv6 addresses only.
 .TP
-.BR \-T \ { acl \||\| a [ dd ]\||\| auth \||\| c [ at ]\||\| d [ n ]\||\| i [ ndex ]\||\| p [ asswd ]\||\| t [ est ]}
-Run in Tool mode. The additional argument selects whether to run as
+.BI \-T \ tool
+Run in Tool mode. The \fItool\fP argument selects whether to run as
 .IR slapadd ,
 .IR slapcat ,
 .IR slapdn ,
 .IR slapindex ,
 .IR slappasswd ,
+.IR slapschema ,
 or
 .I slaptest
 (\fIslapacl\fP and \fIslapauth\fP need the entire \fBacl\fP and \fBauth\fP
@@ -191,6 +193,22 @@ options.  Hosts may be specified by name or IPv4 and IPv6 address formats.
 Ports, if specified, must be numeric.  The default ldap:// port is \fB389\fP
 and the default ldaps:// port is \fB636\fP.
 
+For LDAP over IPC,
+.B name 
+is the name of the socket, and no
+.B port
+is required, nor allowed; note that directory separators must be 
+URL-encoded, like any other characters that are special to URLs; 
+so the socket
+
+        /usr/local/var/ldapi
+
+must be specified as
+
+        ldapi://%2Fusr%2Flocal%2Fvar%2Fldapi
+
+The default location for the IPC socket is LOCALSTATEDIR/run/ldapi
+
 The listener permissions are indicated by
 "x\-mod=\-rwxrwxrwx", "x\-mod=0777" or "x\-mod=777", where any 
 of the "rwx" can be "\-" to suppress the related permission, while any 
@@ -334,6 +352,7 @@ To test whether the configuration file is correct or not, type:
 .BR slapdn (8),
 .BR slapindex (8),
 .BR slappasswd (8),
+.BR slapschema (8),
 .BR slaptest (8).
 .LP
 "OpenLDAP Administrator's Guide" (http://www.OpenLDAP.org/doc/admin/)