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

diff --git a/plugin/auth-pam/Makefile b/plugin/auth-pam/Makefile
index 3e7c6cef2248b6839c0ed8eea3feac050ac43b9c..e69fe3ffcb3ebe669e887eb9fc65fe461e138ae5 100755 (executable)
--- 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 aaac2409e7c6f1845f44d70470e40ca37ac8acb4..8636a8e4d45dfddfb2069964c9a6ac550793d9ab 100644 (file)
--- 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,