From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Wed, 18 May 2011 15:18:44 +0000 (-0400)
Subject: FreeBSD needs the main sudo executable to link with -lpam when
X-Git-Tag: SUDO_1_8_2~145^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=159d7e393a138cac2b2bf5f6a6a15b193e847aaa;p=sudo

FreeBSD needs the main sudo executable to link with -lpam when
loading dynaic pam modules for some reason.
---

diff --git a/configure b/configure
index e9b88a727..368da0c11 100755
--- a/configure
+++ b/configure
@@ -17057,9 +17057,17 @@ if test -z "${AUTH_EXCL}${AUTH_REG}" -a -n "$AUTH_EXCL_DEF"; then
 fi
 
 if test ${with_pam-"no"} != "no"; then
-    # Note: we already link the main sudo program with -ldl as needed
+    # We already link with -ldl (see LIBDL below) so no need for that here.
     SUDOERS_LIBS="${SUDOERS_LIBS} -lpam"
 
+    # There should be no need to link the sudo front-end with PAM
+    # as all PAM calls happen via the sudoers plugin.
+    # Unfortunately, not doing so causes problems on FreeBSD at least.
+    case "$OS" in
+	freebsd)
+	    LIBS="${LIBS} -lpam";;
+    esac
+
                     for ac_header in security/pam_appl.h pam/pam_appl.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
diff --git a/configure.in b/configure.in
index e189b2edc..3475f3200 100644
--- a/configure.in
+++ b/configure.in
@@ -2263,9 +2263,17 @@ dnl PAM support.  Systems that use PAM by default set with_pam=default
 dnl and we do the actual tests here.
 dnl
 if test ${with_pam-"no"} != "no"; then
-    # Note: we already link the main sudo program with -ldl as needed
+    # We already link with -ldl (see LIBDL below) so no need for that here.
     SUDOERS_LIBS="${SUDOERS_LIBS} -lpam"
 
+    # There should be no need to link the sudo front-end with PAM
+    # as all PAM calls happen via the sudoers plugin.
+    # Unfortunately, not doing so causes problems on FreeBSD at least.
+    case "$OS" in
+	freebsd)
+	    LIBS="${LIBS} -lpam";;
+    esac
+
     dnl
     dnl Some PAM implementations (MacOS X for example) put the PAM headers
     dnl in /usr/include/pam instead of /usr/include/security...