diff options
| author | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2006-11-01 04:58:01 +0000 |
|---|---|---|
| committer | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2006-11-01 04:58:01 +0000 |
| commit | 5b78d4d0e39eddddaeb7ebca075e0468849c3232 (patch) | |
| tree | 6dc42a7e34b8dc0e6f9e204f81416a8816adeae3 | |
| parent | Merged Alon's branch: (diff) | |
| download | openvpn-5b78d4d0e39eddddaeb7ebca075e0468849c3232.tar.xz | |
auth-pam change: link with -lpam rather
than dlopen (Roy Marples).
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@1421 e7ae566f-a301-0410-adde-c780ea21d3b5
| -rwxr-xr-x | plugin/auth-pam/Makefile | 2 | ||||
| -rw-r--r-- | plugin/auth-pam/pamdl.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/plugin/auth-pam/Makefile b/plugin/auth-pam/Makefile index 3e7c6ce..e69fe3f 100755 --- a/plugin/auth-pam/Makefile +++ b/plugin/auth-pam/Makefile @@ -4,7 +4,7 @@ # If PAM modules are not linked against libpam.so, set DLOPEN_PAM to 1. This # must be done on SUSE 9.1, at least. -DLOPEN_PAM=1 +DLOPEN_PAM=0 ifeq ($(DLOPEN_PAM),1) LIBPAM=-ldl diff --git a/plugin/auth-pam/pamdl.c b/plugin/auth-pam/pamdl.c index aaac240..8636a8e 100644 --- a/plugin/auth-pam/pamdl.c +++ b/plugin/auth-pam/pamdl.c @@ -10,7 +10,6 @@ #include <stdio.h> #include <dlfcn.h> #include <security/pam_appl.h> -#include <security/_pam_macros.h> #include "pamdl.h" @@ -74,7 +73,7 @@ int pam_set_item(pam_handle_t *pamh, int item_type, const void *item) return real_pam_set_item(pamh, item_type, item); } -int pam_get_item(const pam_handle_t *pamh, int item_type, const void **item) +int pam_get_item(pam_handle_t *pamh, int item_type, const void **item) { int (*real_pam_get_item)(const pam_handle_t *, int, const void **); RESOLVE_PAM_FUNCTION(pam_get_item, int, |