Merge pull request donapieppo#23 from sshedi/misc-fixes

Misc fixes

Author: donapieppo

Makefile

@@ -33,9 +33,10 @@ test:	libnss_ato_test.c
 
 install:
 	# remeber  /lib/libnss_compat.so.2 -> libnss_compat-2.3.6.so
-	${INSTALL_DATA} libnss_ato.so.2 ${DESTDIR}/${prefix}/lib/libnss_ato-2.3.6.so
-	${INSTALL_DATA} libnss-ato.3 ${DESTDIR}/${manprefix}/man3
+	${INSTALL_DATA} -D libnss_ato.so.2 ${DESTDIR}/${prefix}/lib/libnss_ato-2.3.6.so
+	${INSTALL_DATA} -D libnss-ato.3 ${DESTDIR}/${manprefix}/man3/libnss-ato.3
 	cd ${DESTDIR}/${prefix}/lib && ln -fs libnss_ato-2.3.6.so libnss_ato.so.2
+	${INSTALL_DATA} -D libnss-ato.conf ${DESTDIR}/${sysconfdir}/libnss-ato.conf
 
 clean:
 	rm -f libnss_ato.so.2 libnss_ato_test

libnss-ato.conf

@@ -1,4 +1,3 @@
-test_user:x:1000:1000:Test User,,,:/home/test:/bin/bash
 # Only the first line of this file is parsed.
 # All next lines are comments.
 # You can not set multiple user accounts with this

libnss_ato.c

@@ -9,16 +9,16 @@
  * this product may be distributed under the terms of
  * the GNU Lesser General Public License.
  *
- * version 0.2 
- * 
+ * version 0.2
+ *
  * CHANGELOG:
- * strip end of line in reading /etc/libnss-ato 
+ * strip end of line in reading /etc/libnss-ato
  * suggested by Kyler Laird
  *
  * TODO:
  *
  * check bugs
- * 
+ *
  */
 
 #include <nss.h>
@@ -40,8 +40,8 @@
  * Extra lines are comments (not processed).
  */
 
-	struct passwd *
-read_conf() 
+struct passwd *
+read_conf(void)
 {
 	FILE *fd;
 	struct passwd *conf;
@@ -61,15 +61,15 @@ read_conf()
 	return conf;
 }
 
-/* 
+/*
  * Allocate some space from the nss static buffer.  The buffer and buflen
  * are the pointers passed in by the C library to the _nss_ntdom_*
- * functions. 
+ * functions.
  *
- *  Taken from glibc 
+ *  Taken from glibc
  */
 
-	static char * 
+static char *
 get_static(char **buffer, size_t *buflen, int len)
 {
 	char *result;
@@ -90,12 +90,11 @@ get_static(char **buffer, size_t *buflen, int len)
 	return result;
 }
 
-
-	enum nss_status
-_nss_ato_getpwnam_r( const char *name, 
-		struct passwd *p, 
-		char *buffer, 
-		size_t buflen, 
+enum nss_status
+_nss_ato_getpwnam_r( const char *name,
+		struct passwd *p,
+		char *buffer,
+		size_t buflen,
 		int *errnop)
 {
 	struct passwd *conf;
@@ -121,7 +120,7 @@ _nss_ato_getpwnam_r( const char *name,
 	/* pw_name stay as the name given */
 	strcpy(p->pw_name, name);
 
-	if ((p->pw_passwd = get_static(&buffer, &buflen, strlen("x") + 1)) == NULL) {
+	if ((p->pw_passwd = get_static(&buffer, &buflen, (int)sizeof("x"))) == NULL) {
 		return NSS_STATUS_TRYAGAIN;
 	}
 
@@ -130,22 +129,21 @@ _nss_ato_getpwnam_r( const char *name,
 	return NSS_STATUS_SUCCESS;
 }
 
-	enum nss_status
+enum nss_status
 _nss_ato_getspnam_r( const char *name,
 		struct spwd *s,
 		char *buffer,
 		size_t buflen,
 		int *errnop)
 {
-
 	/* If out of memory */
 	if ((s->sp_namp = get_static(&buffer, &buflen, strlen(name) + 1)) == NULL) {
 		return NSS_STATUS_TRYAGAIN;
 	}
 
 	strcpy(s->sp_namp, name);
 
-	if ((s->sp_pwdp = get_static(&buffer, &buflen, strlen("*") + 1)) == NULL) {
+	if ((s->sp_pwdp = get_static(&buffer, &buflen, (int)sizeof("*"))) == NULL) {
 		return NSS_STATUS_TRYAGAIN;
 	}
 

libnss_ato_test.c

@@ -6,22 +6,21 @@
 
 struct spwd *getspnam(const char *name);
 
-int main (int argc, char *argv[]){
+int main(int argc, char *argv[]) {
 
 	struct passwd *p;
 	struct spwd *s;
 
-	char *usern="pippo.pluto";
-	
-	if(argc ==2)
-	{
-		usern=argv[1];
+	char *usern = "pippo.pluto";
+
+	if (argc == 2) {
+		usern = argv[1];
 	}
 
-	if (!(p=getpwnam(usern))) {
+	if (!(p = getpwnam(usern))) {
 		return -1;
 	}
-	
+
 	printf("FROM PASSWORD:\n");
 
 	printf("\tname:  %s\n", p->pw_name);
@@ -34,10 +33,8 @@ int main (int argc, char *argv[]){
 		return -1;
 	}
 
-	printf ("\tname:  %s\n", s->sp_namp);
-	printf ("\tpass:  %s\n", s->sp_pwdp);
+	printf("\tname:  %s\n", s->sp_namp);
+	printf("\tpass:  %s\n", s->sp_pwdp);
 
 	return 0;
-
 }
-

rpm/libnss-ato.spec

@@ -12,22 +12,23 @@ NSS module to match all request of unknown user to a single user (All To One)
 %install
 %define _copy_to_buildroot() mkdir -p %{buildroot}%2; cp -r %{_topdir}/%1 %{buildroot}%2
 
-# Copy the necessary files to the buildroot. 
+# Copy the necessary files to the buildroot.
 #
 # There are lots of ways to do this:
 # - Manually write the necessary mkdir/cp commands
 # - Use macros to make writing these commands easier
 # - Call a helper script to populate the buildroot (e.g. by parsing debian/*.install)
 #
-# Here is an example of doing this with macros. 
+# Here is an example of doing this with macros.
 %{_copy_to_buildroot libnss_ato.so.2 /lib64}
-ln -s /lib64/libnss_ato.so.2 %{buildroot}/lib64/libnss_ato-2.3.6.so
+ln -srv %{buildroot}/lib64/libnss_ato.so.2 %{buildroot}/lib64/libnss_ato-2.3.6.so
 %{_copy_to_buildroot libnss-ato.3 /usr/share/man/man3}
+%{_copy_to_buildroot libnss-ato.conf /etc}
 
 %debug_package
 
 %files
-# Specify the files to package. 
 /lib64/libnss_ato.so.2
 /lib64/libnss_ato-2.3.6.so
-/usr/share/man/man3/libnss-ato.3.gz
+%config(noreplace) /etc/libnss-ato.conf
+/usr/share/man/man3/libnss-ato.3