Align SSD names with nsswitch.conf names

diff --git a/contrib/slapd-modules/nssov/README b/contrib/slapd-modules/nssov/README
index 37fcda0fa94cf157b888406f6185f4df5dc3496f..d0e527eff5bcadc76cef510f328c1ca7af0ca6ef 100644 (file)
--- 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 08f318d65e578eef354af8c1e616c15d27284fbd..fbd61916377b901184773faaa76deacf519479fb 100644 (file)
--- 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 7e45d776df3460eb75cda72738de0cfb7b163ec0..d91ad4628f424eebb12c521b57944c2a0677f0a3 100644 (file)
--- 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