[SCM] GNU shishi branch, master, updated. shishi-1-0-2-7-g07cd137

[Mats Erik Andersson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU shishi".

http://git.savannah.gnu.org/cgit/shishi.git/commit/?id=07cd137bf79af3b9abfe08ff55c36a0c6785e733

The branch, master has been updated
       via  07cd137bf79af3b9abfe08ff55c36a0c6785e733 (commit)
      from  cbc4c1ca3f8af8ac80248aab5b06244d5df5fda3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 07cd137bf79af3b9abfe08ff55c36a0c6785e733
Author: Mats Erik Andersson <address@hidden>
Date:   Wed Apr 10 22:14:14 2013 +0200

    pam_shishi: Portability changes.
    
    Leave the so-called static module set-up to the system
    specific headers.  In particular, do not set PAM_STATIC,
    and set PAM_EXTERN to empty at most.  Builds in Solaris.

-----------------------------------------------------------------------

Summary of changes:
 extra/pam_shishi/pam_shishi.c |   47 +++++++++++++++++++++-------------------
 1 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/extra/pam_shishi/pam_shishi.c b/extra/pam_shishi/pam_shishi.c
index 6380f51..28422a3 100644
--- a/extra/pam_shishi/pam_shishi.c
+++ b/extra/pam_shishi/pam_shishi.c
@@ -21,23 +21,18 @@
  */
 
 #if HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #ifdef STDC_HEADERS
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <ctype.h>
+# include <stdio.h>
+# include <stdlib.h>
+# include <stdarg.h>
+# include <ctype.h>
 #endif
 
 #include <shishi.h>
 
-/* Libtool defines PIC for shared objects */
-#ifndef PIC
-#define PAM_STATIC
-#endif
-
 /* These #defines must be present according to PAM documentation. */
 #define PAM_SM_AUTH
 #define PAM_SM_ACCOUNT
@@ -45,26 +40,26 @@
 #define PAM_SM_PASSWORD
 
 #ifdef HAVE_SECURITY_PAM_APPL_H
-#include <security/pam_appl.h>
+# include <security/pam_appl.h>
 #endif
 #ifdef HAVE_SECURITY_PAM_MODULES_H
-#include <security/pam_modules.h>
+# include <security/pam_modules.h>
 #endif
 
 #if defined DEBUG_PAM && defined HAVE_SECURITY__PAM_MACROS_H
-#define DEBUG
-#include <security/_pam_macros.h>
+# define DEBUG
+# include <security/_pam_macros.h>
 #else
-#define D(x)                   /* nothing */
+# define D(x)                  /* nothing */
 #endif
 
+/* Rely on <security/pam_modules.h>
+ * for settings in general, as PAM_EXTERN
+ * is not universal among PAM implementations.
+ */
 #ifndef PAM_EXTERN
-#ifdef PAM_STATIC
-#define PAM_EXTERN static
-#else
-#define PAM_EXTERN extern
-#endif
-#endif
+# define PAM_EXTERN
+#endif /* !PAM_EXTERN */
 
 PAM_EXTERN int
 pam_sm_authenticate (pam_handle_t * pamh,
@@ -287,6 +282,7 @@ pam_sm_chauthtok (pam_handle_t * pamh, int flags, int argc, 
const char **argv)
   return retval;
 }
 
+/* Linux-PAM.  */
 #ifdef PAM_STATIC
 
 struct pam_module _pam_shishi_modstruct = {
@@ -299,4 +295,11 @@ struct pam_module _pam_shishi_modstruct = {
   pam_sm_chauthtok
 };
 
-#endif
+#endif /* PAM_STATIC */
+
+/* OpenPAM */
+#ifdef PAM_MODULE_ENTRY
+
+PAM_MODULE_ENTRY("pam_shishi");
+
+#endif /* PAM_MODULE_ENTRY */


hooks/post-receive
-- 
GNU shishi