8 files changed, 23 insertions, 10 deletions
diff --git a/Linux-PAM/libpamc/Makefile b/Linux-PAM/libpamc/Makefile
index f1c90669..ee5c2086 100644
--- a/Linux-PAM/libpamc/Makefile
+++ b/Linux-PAM/libpamc/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.1.1.1 2001/04/29 04:17:13 hartmans Exp $
+# $Id: Makefile,v 1.8 2005/03/29 20:41:20 toady Exp $
 #
 
 # lots of debugging information goes to /tmp/pam-debug.log
@@ -12,6 +12,9 @@ ifeq ($(DEBUG_REL),yes)
 else
  LIBNAME=libpamc
 endif
+ifeq ($(WITH_PRELUDE),yes)
+ CFLAGS += -DPRELUDE -DLIBPRELUDE_CONFIG_PREFIX=\"`libprelude-config --prefix`\"
+endif
 VERSION=.$(MAJOR_REL)
 MODIFICATION=.$(MINOR_REL)
 
@@ -59,7 +62,7 @@ static/%.o : %.c
 $(LIBNAMED): $(DLIBOBJECTS)
 ifeq ($(DYNAMIC_LIBPAM),yes)
     ifeq ($(USESONAME),yes)
-	$(LD_L) $(SOSWITCH) $(LIBNAMEDNAME) -o $@ $(DLIBOBJECTS) $(MODULES) $(LINKLIBS)
+	$(LD_L) $(SOSWITCH)$(LIBNAMEDNAME) -o $@ $(DLIBOBJECTS) $(MODULES) $(LINKLIBS)
     else
 	$(LD_L) -o $@ $(DLIBOBJECTS) $(MODULES)
     endif
@@ -73,9 +76,11 @@ endif
 
 $(LIBNAMEDSTATIC): $(SLIBOBJECTS)
 ifeq ($(STATIC_LIBPAM),yes)
-	$(AR) rc $@ $(SLIBOBJECTS) $(MODULES)
+	$(AR) rcu $@ $(SLIBOBJECTS) $(MODULES)
+ifdef RANLIB
 	$(RANLIB) $@
 endif
+endif
 
 install: all
 	$(MKDIR) $(FAKEROOT)$(INCLUDED)
@@ -83,7 +88,11 @@ install: all
 ifeq ($(DYNAMIC_LIBPAM),yes)
 	$(MKDIR) $(FAKEROOT)$(libdir)
 	$(INSTALL) -m $(SHLIBMODE) $(LIBNAMED) $(FAKEROOT)$(libdir)/$(LIBNAMEDFULL)
+ifndef FAKEROOT
 	$(LDCONFIG)
+else
+	$(LDCONFIG) -n $(FAKEROOT)$(libdir)
+endif
   ifneq ($(DYNTYPE),"sl")
 	( cd $(FAKEROOT)$(libdir) ; rm -f $(LIBNAMED) ; ln -s $(LIBNAMEDNAME) $(LIBNAMED) )
   endif
@@ -96,12 +105,15 @@ remove:
 	rm -f $(FAKEROOT)$(INCLUDED)/pam_client.h
 	rm -f $(FAKEROOT)$(libdir)/$(LIBNAMEDFULL)
 	rm -f $(FAKEROOT)$(libdir)/$(LIBNAMED)
+ifndef FAKEROOT
 	$(LDCONFIG)
+endif
 	rm -f $(FAKEROOT)$(libdir)/$(LIBNAMEDSTATIC)
 
 clean:
 	rm -f a.out core *~ static/*.o dynamic/*.o
 	rm -f *.a *.out *.o *.so ./include/security/*~
+	rm -f *.orig $(LIBNAMEDNAME) $(LIBNAMEDFULL)
 	if [ -d dynamic ]; then rmdir dynamic ; fi
 	if [ -d static ]; then rmdir static ; fi
 
diff --git a/Linux-PAM/libpamc/include/security/pam_client.h b/Linux-PAM/libpamc/include/security/pam_client.h
index 7c474689..99530322 100644
--- a/Linux-PAM/libpamc/include/security/pam_client.h
+++ b/Linux-PAM/libpamc/include/security/pam_client.h
@@ -1,5 +1,5 @@
 /*
- * $Id: pam_client.h,v 1.1.1.2 2002/09/15 20:08:42 hartmans Exp $
+ * $Id: pam_client.h,v 1.6 2001/09/19 06:18:46 agmorgan Exp $
  *
  * Copyright (c) 1999 Andrew G. Morgan <morgan@linux.kernel.org>
  *
diff --git a/Linux-PAM/libpamc/libpamc.h b/Linux-PAM/libpamc/libpamc.h
index 4b47029f..1c9397c9 100644
--- a/Linux-PAM/libpamc/libpamc.h
+++ b/Linux-PAM/libpamc/libpamc.h
@@ -1,5 +1,5 @@
 /*
- * $Id: libpamc.h,v 1.1.1.1 2001/04/29 04:17:13 hartmans Exp $
+ * $Id: libpamc.h,v 1.2 2000/11/19 23:54:03 agmorgan Exp $
  *
  * Copyright (c) Andrew G. Morgan <morgan@ftp.kernel.org>
  *
diff --git a/Linux-PAM/libpamc/pamc_client.c b/Linux-PAM/libpamc/pamc_client.c
index 82d61262..19eff429 100644
--- a/Linux-PAM/libpamc/pamc_client.c
+++ b/Linux-PAM/libpamc/pamc_client.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pamc_client.c,v 1.1.1.1 2001/04/29 04:17:13 hartmans Exp $
+ * $Id: pamc_client.c,v 1.1.1.1 2000/06/20 22:11:25 agmorgan Exp $
  *
  * Copyright (c) Andrew G. Morgan <morgan@ftp.kernel.org>
  *
diff --git a/Linux-PAM/libpamc/pamc_converse.c b/Linux-PAM/libpamc/pamc_converse.c
index 426f581d..131789fb 100644
--- a/Linux-PAM/libpamc/pamc_converse.c
+++ b/Linux-PAM/libpamc/pamc_converse.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pamc_converse.c,v 1.1.1.1 2001/04/29 04:17:13 hartmans Exp $
+ * $Id: pamc_converse.c,v 1.2 2001/01/20 22:29:47 agmorgan Exp $
  *
  * Copyright (c) Andrew G. Morgan <morgan@ftp.kernel.org>
  *
diff --git a/Linux-PAM/libpamc/pamc_load.c b/Linux-PAM/libpamc/pamc_load.c
index 2e044eb9..01304cc1 100644
--- a/Linux-PAM/libpamc/pamc_load.c
+++ b/Linux-PAM/libpamc/pamc_load.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pamc_load.c,v 1.1.1.1 2001/04/29 04:17:13 hartmans Exp $
+ * $Id: pamc_load.c,v 1.1.1.1 2000/06/20 22:11:26 agmorgan Exp $
  *
  * Copyright (c) 1999 Andrew G. Morgan <morgan@ftp.kernel.org>
  *
diff --git a/Linux-PAM/libpamc/test/modules/pam_secret.c b/Linux-PAM/libpamc/test/modules/pam_secret.c
index 557f5959..95f26014 100644
--- a/Linux-PAM/libpamc/test/modules/pam_secret.c
+++ b/Linux-PAM/libpamc/test/modules/pam_secret.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pam_secret.c,v 1.1.1.1 2001/04/29 04:17:14 hartmans Exp $
+ * $Id: pam_secret.c,v 1.3 2004/09/14 14:22:39 kukuk Exp $
  *
  * Copyright (c) 1999 Andrew G. Morgan <morgan@linux.kernel.org>
  */
@@ -206,6 +206,7 @@ char *identify_secret(char *identity, const char *user)
     pwd = getpwnam(user);
     if ((pwd == NULL) || (pwd->pw_dir == NULL)) {
 	D(("user [%s] is not known", user));
+	return NULL;
     }
 
     length_id = strlen(pwd->pw_dir) + sizeof(SECRET_FILE_FORMAT);
diff --git a/Linux-PAM/libpamc/test/regress/Makefile b/Linux-PAM/libpamc/test/regress/Makefile
index ff63e5f0..cba474f9 100644
--- a/Linux-PAM/libpamc/test/regress/Makefile
+++ b/Linux-PAM/libpamc/test/regress/Makefile
@@ -1,7 +1,7 @@
 CFLAGS = -g -I ../../include
 
 test.libpamc: test.libpamc.o
-	$(CC) -o $@ $< -L ../.. -lpamc
+	$(CC) -o $@ $(CFLAGS) $< -L ../.. -lpamc
 
 clean:
 	rm -f test.libpamc test.libpamc.o