nss-pam-ldapd commit: r1225 - in nss-pam-ldapd: . compat

[Commits of the nss-pam-ldapd project <nss-pam-ldapd-commits [at] lists.arthurdejong.org>]

Author: arthur
Date: Tue Sep 28 23:04:44 2010
New Revision: 1225
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1225

Log:
begin merging some of the compatibility improvements from Ted C. Cheng of Symas 
Corporation

Modified:
   nss-pam-ldapd/compat/nss_compat.h
   nss-pam-ldapd/compat/pam_get_authtok.c
   nss-pam-ldapd/configure.ac

Modified: nss-pam-ldapd/compat/nss_compat.h
==============================================================================
--- nss-pam-ldapd/compat/nss_compat.h   Tue Sep 28 21:39:57 2010        (r1224)
+++ nss-pam-ldapd/compat/nss_compat.h   Tue Sep 28 23:04:44 2010        (r1225)
@@ -2,6 +2,7 @@
    nss_compat.h - compatibility definitions for NSS functions
 
    Copyright (C) 2010 Arthur de Jong
+   Copyright (C) 2010 Symas Corporation
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -42,6 +43,12 @@
 #ifdef HAVE_RPC_RPCENT_H
 #include <rpc/rpcent.h>
 #endif /* HAVE_RPC_RPCENT_H */
+#ifdef HAVE_NSS_DBDEFS_H
+#include <nss_dbdefs.h>
+#endif /* HAVE_NSS_DBDEFS_H */
+#ifdef HAVE_NSSWITCH_H
+#include <nsswitch.h>
+#endif /* HAVE_NSSWITCH_H */
 
 #include "compat/ether.h"
 

Modified: nss-pam-ldapd/compat/pam_get_authtok.c
==============================================================================
--- nss-pam-ldapd/compat/pam_get_authtok.c      Tue Sep 28 21:39:57 2010        
(r1224)
+++ nss-pam-ldapd/compat/pam_get_authtok.c      Tue Sep 28 23:04:44 2010        
(r1225)
@@ -2,6 +2,7 @@
    pam_get_authtok.c - replacement function for pam_get_authtok()
 
    Copyright (C) 2009 Arthur de Jong
+   Copyright (C) 2010 Symas Corporation
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -34,6 +35,15 @@
 
 /* warning: this version assumes that try_first_pass is specified */
 
+/* find value of PAM_AUTHTOK_RECOVERY_ERR */
+#ifndef PAM_AUTHTOK_RECOVERY_ERR
+#ifdef PAM_AUTHTOK_RECOVER_ERR
+#define PAM_AUTHTOK_RECOVERY_ERR PAM_AUTHTOK_RECOVER_ERR
+#else
+#define PAM_AUTHTOK_RECOVERY_ERR 21 /* not defined anywhere */
+#endif
+#endif
+
 int pam_get_authtok(pam_handle_t *pamh,int item,const char **authtok,const 
char *prompt)
 {
   int rc;

Modified: nss-pam-ldapd/configure.ac
==============================================================================
--- nss-pam-ldapd/configure.ac  Tue Sep 28 21:39:57 2010        (r1224)
+++ nss-pam-ldapd/configure.ac  Tue Sep 28 23:04:44 2010        (r1225)
@@ -226,6 +226,7 @@
 AC_CHECK_HEADERS([ctype.h strings.h pthread.h fcntl.h limits.h])
 AC_CHECK_HEADERS([nss.h nss_common.h grp.h shadow.h aliases.h netdb.h 
rpc/rpcent.h])
 AC_CHECK_HEADERS([netinet/ether.h arpa/inet.h netinet/in.h])
+AC_CHECK_HEADERS([nsswitch.h nss_dbdefs.h])
 AC_CHECK_HEADERS([sys/socket.h sys/un.h sys/ucred.h ucred.h sys/param.h 
sys/time.h])
 AC_CHECK_HEADERS([getopt.h syslog.h])
 
--
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits