Changeset 111 in openpam

Timestamp:

Apr 12, 2002, 8:16:08 PM (19 years ago)

Author:

Dag-Erling Smørgrav

Message:

Adopt the same preprocessor tricks that Linux-PAM uses for modules.
This reduces the amount of changes needed to adopt modules written
for Linux-PAM.

Sponsored by: DARPA, NAI Labs

Location:

trunk/include/security

Files:

• openpam.h (modified) (3 diffs)
• pam_modules.h (modified) (8 diffs)

trunk/include/security/openpam.h

@@ -32 +32 @@
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/include/security/openpam.h#15 $
+ * $P4: //depot/projects/openpam/include/security/openpam.h#16 $
  */
 
@@ -209 +209 @@
 
 /*
+ * Source-code compatibility with Linux-PAM modules
+ */
+#if defined(PAM_SM_AUTH) || defined(PAM_SM_ACCOUNT) || \
+        defined(PAM_SM_SESSION) || defined(PAM_SM_PASSWORD)
+#define LINUX_PAM_MODULE
+#endif
+#if defined(LINUX_PAM_MODULE) && !defined(PAM_SM_AUTH)
+#define _PAM_SM_AUTHENTICATE    0
+#define _PAM_SM_SETCRED         0
+#else
+#undef PAM_SM_AUTH
+#define PAM_SM_AUTH
+#define _PAM_SM_AUTHENTICATE    pam_sm_authenticate
+#define _PAM_SM_SETCRED         pam_sm_setcred
+#endif
+#if defined(LINUX_PAM_MODULE) && !defined(PAM_SM_ACCOUNT)
+#define _PAM_SM_ACCT_MGMT       0
+#else
+#undef PAM_SM_ACCOUNT
+#define PAM_SM_ACCOUNT
+#define _PAM_SM_ACCT_MGMT       pam_sm_acct_mgmt
+#endif
+#if defined(LINUX_PAM_MODULE) && !defined(PAM_SM_SESSION)
+#define _PAM_SM_OPEN_SESSION    0
+#define _PAM_SM_CLOSE_SESSION   0
+#else
+#undef PAM_SM_SESSION
+#define PAM_SM_SESSION
+#define _PAM_SM_OPEN_SESSION    pam_sm_open_session
+#define _PAM_SM_CLOSE_SESSION   pam_sm_close_session
+#endif
+#if defined(LINUX_PAM_MODULE) && !defined(PAM_SM_PASSWORD)
+#define _PAM_SM_CHAUTHTOK       0
+#else
+#undef PAM_SM_PASSWORD
+#define PAM_SM_PASSWORD
+#define _PAM_SM_CHAUTHTOK       pam_sm_chauthtok
+#endif
+
+/*
  * Infrastructure for static modules using GCC linker sets.
  * You are not expected to understand this.
@@ -228 +268 @@
 static char _pam_name[] = name PAM_SOEXT;                               \
 static struct pam_module _pam_module = { _pam_name, {                   \
-    pam_sm_authenticate, pam_sm_setcred, pam_sm_acct_mgmt,              \
-    pam_sm_open_session, pam_sm_close_session, pam_sm_chauthtok },      \
+    _PAM_SM_AUTHENTICATE, _PAM_SM_SETCRED, _PAM_SM_ACCT_MGMT,           \
+    _PAM_SM_OPEN_SESSION, _PAM_SM_CLOSE_SESSION, _PAM_SM_CHAUTHTOK },   \
     NULL, 0, NULL, NULL };                                              \
 DATA_SET(_openpam_static_modules, _pam_module)

trunk/include/security/pam_modules.h

@@ -32 +32 @@
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/include/security/pam_modules.h#6 $
+ * $P4: //depot/projects/openpam/include/security/pam_modules.h#7 $
  */
 
@@ -50 +50 @@
  */
 
+#if defined(PAM_SM_ACCOUNT)
 PAM_EXTERN int
 pam_sm_acct_mgmt(pam_handle_t *_pamh,
@@ -55 +56 @@
         int _argc,
         const char **_argv);
+#endif
 
+#if defined(PAM_SM_AUTH)
 PAM_EXTERN int
 pam_sm_authenticate(pam_handle_t *_pamh,
@@ -61 +64 @@
         int _argc,
         const char **_argv);
+#endif
 
+#if defined(PAM_SM_PASSWORD)
 PAM_EXTERN int
 pam_sm_chauthtok(pam_handle_t *_pamh,
@@ -67 +72 @@
         int _argc,
         const char **_argv);
+#endif
 
+#if defined(PAM_SM_SESSION)
 PAM_EXTERN int
 pam_sm_close_session(pam_handle_t *_pamh,
@@ -73 +80 @@
         int _args,
         const char **_argv);
+#endif
 
+#if defined(PAM_SM_SESSION)
 PAM_EXTERN int
 pam_sm_open_session(pam_handle_t *_pamh,
@@ -79 +88 @@
         int _argc,
         const char **_argv);
+#endif
 
+#if defined(PAM_SM_AUTH)
 PAM_EXTERN int
 pam_sm_setcred(pam_handle_t *_pamh,
@@ -85 +96 @@
         int _argc,
         const char **_argv);
+#endif
 
 /*