diff options
| author | Thorsten Kukuk <kukuk@thkukuk.de> | 2006-01-22 07:36:54 +0000 |
|---|---|---|
| committer | Thorsten Kukuk <kukuk@thkukuk.de> | 2006-01-22 07:36:54 +0000 |
| commit | 5116bebb80ac7ee441c66b1a884d2653755dc4d9 (patch) | |
| tree | 3099a4612f58dca3a23633d7a00da4283ad025a9 /libpam/pam_dynamic.c | |
| parent | b1b9e62160a35087e006faa799c89431c76b4d89 (diff) | |
| download | pam-5116bebb80ac7ee441c66b1a884d2653755dc4d9.tar.gz pam-5116bebb80ac7ee441c66b1a884d2653755dc4d9.tar.bz2 pam-5116bebb80ac7ee441c66b1a884d2653755dc4d9.zip | |
Relevant BUGIDs: none
Purpose of commit: bugfix
Commit summary:
---------------
Fix compiling of static version of shared libpam, libpamc and libpam_misc
libraries without assuming "--enable-static-modules do not make the modules
dynamically loadable".
2006-01-22 Thorsten Kukuk <kukuk@thkukuk.de>
* configure.in: Don't define PAM_DYNAMIC.
* libpam/pam_handlers.c: Get ride of PAM_DYNAMIC, don't
include pam_dynamic.h
* libpam/pam_dynamic.c: Don't include pam_dynamic.h,
exclude functions if we compile with PAM_STATIC.
* libpam/pam_dynamic.h: Remove.
* libpam/pam_private.h: Add function prototypes from pam_dynamic.h.
* libpam/Makefile.am: Bump version number of libpam, remove
pam_dynamic.h.
Diffstat (limited to 'libpam/pam_dynamic.c')
| -rw-r--r-- | libpam/pam_dynamic.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libpam/pam_dynamic.c b/libpam/pam_dynamic.c index 6bb3d559..5be33c36 100644 --- a/libpam/pam_dynamic.c +++ b/libpam/pam_dynamic.c @@ -33,6 +33,8 @@ #include "pam_private.h" +#ifndef PAM_STATIC + #ifdef PAM_SHL # include <dl.h> #elif defined(PAM_DYLD) @@ -41,8 +43,6 @@ # include <dlfcn.h> #endif /* PAM_SHL */ -#include "pam_dynamic.h" - #ifndef SHLIB_SYM_PREFIX #define SHLIB_SYM_PREFIX "_" #endif @@ -138,3 +138,5 @@ _pam_dlerror (void) return dlerror (); #endif } + +#endif |