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

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

Author: arthur
Date: Fri May 11 14:27:04 2012
New Revision: 1690
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?revision=1690&view=revision

Log:
provide a compatibility version of struct spwd for systems without it

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

Modified: nss-pam-ldapd/compat/nss_compat.h
==============================================================================
--- nss-pam-ldapd/compat/nss_compat.h   Fri May 11 12:51:42 2012        (r1689)
+++ nss-pam-ldapd/compat/nss_compat.h   Fri May 11 14:27:04 2012        (r1690)
@@ -1,7 +1,7 @@
 /*
    nss_compat.h - compatibility definitions for NSS functions
 
-   Copyright (C) 2010 Arthur de Jong
+   Copyright (C) 2010, 2012 Arthur de Jong
    Copyright (C) 2010 Symas Corporation
 
    This library is free software; you can redistribute it and/or
@@ -148,4 +148,19 @@
   void *nip; /* changed from `service_user *nip' */
 };
 
+/* Define struct spwd if it was not found on the system. */
+#ifndef HAVE_STRUCT_SPWD
+struct spwd {
+  char *sp_namp;
+  char *sp_pwdp;
+  long sp_lstchg;
+  long sp_min;
+  long sp_max;
+  long sp_warn;
+  long sp_inact;
+  long sp_expire;
+  unsigned long sp_flag;
+};
+#endif /* not HAVE_STRUCT_SPWD */
+
 #endif /* not COMPAT__NSS_H */

Modified: nss-pam-ldapd/configure.ac
==============================================================================
--- nss-pam-ldapd/configure.ac  Fri May 11 12:51:42 2012        (r1689)
+++ nss-pam-ldapd/configure.ac  Fri May 11 14:27:04 2012        (r1690)
@@ -378,6 +378,19 @@
       #include <rpc/rpcent.h>
       #endif])
 
+  # check for a definition of struct spwd
+  AC_CHECK_TYPES(struct spwd,,,[
+      #ifdef HAVE_NSS_H
+      #include <nss.h>
+      #endif
+      #ifdef HAVE_NSS_COMMON_H
+      #include <nss_common.h>
+      #endif
+      #include <pwd.h>
+      #ifdef HAVE_SHADOW_H
+      #include <shadow.h>
+      #endif])
+
   # check for a definition of enum nss_status and nss_backend_t
   AC_CHECK_TYPES([enum nss_status,nss_backend_t],,,[
       #ifdef HAVE_NSS_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/