From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Thu, 4 Jun 2009 20:15:49 +0000 (+0000)
Subject: Align SSD names with nsswitch.conf names
X-Git-Tag: OPENLDAP_REL_ENG_2_4_17~60
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=94fc1fae38af11c30f20a5f359b472c35754e158;p=openldap

Align SSD names with nsswitch.conf names
Note that pam-session logging requires a rootdn
---

diff --git a/contrib/slapd-modules/nssov/README b/contrib/slapd-modules/nssov/README
index 37fcda0fa9..d0e527eff5 100644
--- a/contrib/slapd-modules/nssov/README
+++ b/contrib/slapd-modules/nssov/README
@@ -42,16 +42,16 @@ for each NSS service that will be used. SSDs are configured using
 	nssov-ssd <service> <url>
 
 where the <service> may be one of
-	alias
-	ether
+	aliases
+	ethers
 	group
-	host
+	hosts
 	netgroup
-	network
+	networks
 	passwd
-	protocol
+	protocols
 	rpc
-	service
+	services
 	shadow
 
 and the <url> must be of the form
diff --git a/contrib/slapd-modules/nssov/nssov.c b/contrib/slapd-modules/nssov/nssov.c
index 08f318d65e..fbd6191637 100644
--- a/contrib/slapd-modules/nssov/nssov.c
+++ b/contrib/slapd-modules/nssov/nssov.c
@@ -397,16 +397,16 @@ static void *acceptconn(void *ctx, void *arg)
 }
 
 static slap_verbmasks nss_svcs[] = {
-	{ BER_BVC("alias"), NM_alias },
-	{ BER_BVC("ether"), NM_ether },
+	{ BER_BVC("aliases"), NM_alias },
+	{ BER_BVC("ethers"), NM_ether },
 	{ BER_BVC("group"), NM_group },
-	{ BER_BVC("host"), NM_host },
+	{ BER_BVC("hosts"), NM_host },
 	{ BER_BVC("netgroup"), NM_netgroup },
-	{ BER_BVC("network"), NM_network },
+	{ BER_BVC("networks"), NM_network },
 	{ BER_BVC("passwd"), NM_passwd },
-	{ BER_BVC("protocol"), NM_protocol },
+	{ BER_BVC("protocols"), NM_protocol },
 	{ BER_BVC("rpc"), NM_rpc },
-	{ BER_BVC("service"), NM_service },
+	{ BER_BVC("services"), NM_service },
 	{ BER_BVC("shadow"), NM_shadow },
 	{ BER_BVNULL, 0 }
 };
diff --git a/contrib/slapd-modules/nssov/slapo-nssov.5 b/contrib/slapd-modules/nssov/slapo-nssov.5
index 7e45d776df..855647d967 100644
--- a/contrib/slapd-modules/nssov/slapo-nssov.5
+++ b/contrib/slapd-modules/nssov/slapo-nssov.5
@@ -83,16 +83,16 @@ This directive configures a Service Search Descriptor (SSD) for each NSS
 service that will be used.  The <service> may be one of
 .RS
 .nf
-    alias
-    ether
+    aliases
+    ethers
     group
-    host
+    hosts
     netgroup
-    network
+    networks
     passwd
-    protocol
+    protocols
     rpc
-    service
+    services
     shadow
 .fi
 .RE
@@ -247,7 +247,9 @@ of the form
 .RE
 Upon logout the corresponding value will be deleted. This feature allows
 a single LDAP Search to be used to check which users are logged in across
-all the hosts of a network. By default no services are configured.
+all the hosts of a network. The rootdn of the database is used to perform
+the updates of the loginStatus attribute, so a rootdn must already be
+configured for this feature to work. By default no services are configured.
 .LP
 The PAM functions support LDAP Password Policy as well. If the password
 policy overlay is in use (see