Fixed naming of nss_mapuser.5 and conf file; naming in manpages

7 files changed, 20 insertions, 18 deletions

diff --git a/Makefile b/Makefile
index 598123f..d32c8f5 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ install: all
 			$(DESTDIR)$(LIBDIR)/${NSSNAMELIB}
 	$(STRIP) --strip-all --keep-symbol=_nss_mapuid_getpwuid_r \
 			$(DESTDIR)$(LIBDIR)/${NSSUIDLIB}
-	install -m 644 mapuser_nss.conf $(DESTDIR)/etc/
+	install -m 644 nss_mapuser.conf $(DESTDIR)/etc/
 
 clean:
 	rm -f *.o $(NSSNAMELIB) $(NSSUIDLIB)
diff --git a/README b/README
index efcec72..8542b5a 100644
--- a/README
+++ b/README
@@ -17,7 +17,7 @@ it is not possible to determine if a username is valid without authenticating
 at the same time.
 
 The mapping is done to a single account specified in the configuration
-file /etc/mapuser_nss.conf.
+file /etc/nss_mapuser.conf.
 
 The returned passwd field is always filled in as 'x', so that authentication
 of the base account is not possible through PAM.  Only the mapped accounts
@@ -40,7 +40,7 @@ This package will create the radius_user account with adduser if it does not
 already exist, and that is the default mapping in the configuration, and will
 add the group radius_users with the addgroup command.
 
-The mapping can be changed in the configuration file /etc/mapuser_nss.conf.
+The mapping can be changed in the configuration file /etc/nss_mapuser.conf.
 In that case, the account must already exist, or should be created with
 a command similar to:
    adduser --quiet --firstuid 1000 --disabled-login --ingroup GROUP \
diff --git a/debian/libnss-mapuser.manpages b/debian/libnss-mapuser.manpages
index 37b163c..f6b63f5 100644
--- a/debian/libnss-mapuser.manpages
+++ b/debian/libnss-mapuser.manpages
@@ -1,2 +1,2 @@
-mapuser_nss.5
+nss_mapuser.5
 nss_mapuser.8
diff --git a/map_common.c b/map_common.c
index c274853..1c3bfa9 100644
--- a/map_common.c
+++ b/map_common.c
@@ -27,7 +27,7 @@
 #include "map_common.h"
 #include <sys/stat.h>
 
-static const char config_file[] = "/etc/mapuser_nss.conf";
+static const char config_file[] = "/etc/nss_mapuser.conf";
 
 #define DEF_MIN_UID 1001 /*  fail lookups on uid's below this value */
 
diff --git a/mapuser_nss.5 b/nss_mapuser.5
index a12c0f8..2bbabad 100644
--- a/mapuser_nss.5
+++ b/nss_mapuser.5
@@ -1,11 +1,11 @@
-.TH mapuser_nss 5
+.TH nss_mapuser 5
 .\" Copyright 2017 Cumulus Networks, Inc.  All rights reserved.
 .SH NAME
-mapuser_nss.conf \- NSS mapuser configuration file
+nss_mapuser.conf \- NSS mapuser configuration file
 .SH DESCRIPTION
 This is the configuration file for the NSS mapuser plugins.
 See the
-.BR mapuser_nss (8)
+.BR nss_mapuser (8)
 manpage for more general information on the plugin.
 This configuration file controls debug settings, the local account used
 for mapping users, and which usernames (accounts) and uids are skipped.
@@ -56,7 +56,7 @@ overhead for the standard local user accounts.
 .SH "SEE ALSO"
 .BR adduser (8),
 .BR pam_radius_auth (8),
-.BR mapuser_nss (8),
+.BR nss_mapuser (8),
 .BR nsswitch.conf (5),
 .BR getpwuid (3),
 .BR getpwnam (3),
diff --git a/nss_mapuser.8 b/nss_mapuser.8
index c74694f..d19aad7 100644
--- a/nss_mapuser.8
+++ b/nss_mapuser.8
@@ -1,4 +1,4 @@
-.TH mapuser_nss 8
+.TH nss_mapuser 8
 .\" Copyright 2017 Cumulus Networks, Inc.  All rights reserved.
 .SH NAME
 libnss_mapname.so.2 \- NSS mapuser plugin
@@ -7,7 +7,7 @@ libnss_mapuid.so.2 \- NSS mapuid plugin
 .SH DESCRIPTION
 These are the NSS mapuser plugins.
 See the
-.BR mapuser_nss (5)
+.BR nss_mapuser (5)
 manpage for information on configuration.
 These plugins are intended to be used with protocols such as RADIUS that do not
 provide enough information to define a linux account (uid, gid, home directory).
@@ -99,7 +99,7 @@ end, the open script will also create the home directory using
 .BR mkhomedir_helper (8),
 .BR pam_radius_auth (8),
 .BR pam_script (8),
-.BR mapuser_nss (5),
+.BR nss_mapuser (5),
 .BR nsswitch.conf (5),
 .BR getpwuid (3),
 .BR getpwnam (3),
diff --git a/mapuser_nss.conf b/nss_mapuser.conf
index 4ddc42d..cf9ad71 100644
--- a/mapuser_nss.conf
+++ b/nss_mapuser.conf
@@ -1,11 +1,13 @@
-# This file is part of the libnss-mapuser pacakge.
-# This file should be world readable.  It does not contain any security
+# This file is part of the libnss-mapuser package.
+# It should be world readable.  It does not contain any security
 # sensitive information.
 #
-# Edit /etc/nsswitch.conf to add mapuer to the passwd lookup, similar to this
-# where mapuser must be the be prior to compat, since uid lookups would
-# otherwise always match via compat
-#    passwd: mapuser compat
+# Edit /etc/nsswitch.conf to add mapuser and mapuid to the passwd lookup,
+# similar to the example below.
+# mapuid must be the be prior to compat, since uid lookups would
+# otherwise always match via compat, and mapuser must be last, since
+# it always matches anything.
+#    passwd: mapuid compat mapuser
 
 # if set, errors and other issues are logged with syslog
 # debug=1