From: John Wolfe <jwolfe@vmware.com>
Date: Thu, 4 Mar 2021 21:48:46 +0000 (-0800)
Subject: Configuring OVT with the --without-pam option will implicitly disable vgauth.
X-Git-Tag: stable-11.3.0~118
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30a9f295681983c778ea89eef379b8822518e524;p=thirdparty%2Fopen-vm-tools.git

Configuring OVT with the --without-pam option will implicitly disable vgauth.

When no vgauth option is given alongside -–without-pam, a warning
is displayed with a message “Building without PAM; vgauth will be
disabled.”.

When -–disable-vgauth is supplied alongside –-without-pam, no
warning or error message is displayed.

When -–enable-vgauth is supplied alongside -–without-pam, an
error will be thrown and the configure stage will be aborted with an
error message “Cannot enable vgauth without PAM. Please configure
without --without-pam or without --enable-vgauth.”

Github Issue: https://github.com/vmware/open-vm-tools/issues/481
---

diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
index d08593346..9a8afef1b 100644
--- a/open-vm-tools/configure.ac
+++ b/open-vm-tools/configure.ac
@@ -535,8 +535,8 @@ AC_VMW_CHECK_LIB([fuse],
 #
 AC_ARG_WITH([pam],
    [AS_HELP_STRING([--without-pam],
-     [compiles without PAM support.])],
-   [],
+     [compiles without PAM support (disables vgauth).])],
+   [with_pam="$withval"],
    [with_pam=yes])
 
 if test "$with_pam" = "yes"; then
@@ -556,11 +556,19 @@ AC_ARG_ENABLE([vgauth],
    [AS_HELP_STRING([--disable-vgauth],
      [do not build vgauth.])],
    [
+    if test "$with_pam" = "no" -a "$enableval" = "yes"; then
+       AC_MSG_ERROR([Cannot enable vgauth without PAM. Please configure
+                     without --without-pam or without --enable-vgauth.])
+    fi
     enable_vgauth="$enableval"
     use_xmlsec1=yes
    ],
    [
-    if test "$os" = "linux"; then
+    if test "$with_pam" = "no"; then
+       enable_vgauth="no"
+       use_xmlsec1="no"
+       AC_MSG_WARN("Building without PAM; vgauth will be disabled.")
+    elif test "$os" = "linux"; then
        enable_vgauth=yes
        use_xmlsec1=yes
     else