From 117ed0a24c47d91d7c0ba836b218f620195afd61 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gdeschner@redhat.com>
Date: Thu, 17 Oct 2013 18:53:07 +0200
Subject: docs: Fill in GSSPROXY_BEHAVIOR default setting from configure
 option.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Günther Deschner <gdeschner@redhat.com>
Reviewed-by: Simo Sorce <simo@redhat.com>
---
 proxy/conf_macros.m4             | 6 ++++++
 proxy/man/gssproxy-mech.8.xml.in | 8 +++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/proxy/conf_macros.m4 b/proxy/conf_macros.m4
index a04f694..a0ecb13 100644
--- a/proxy/conf_macros.m4
+++ b/proxy/conf_macros.m4
@@ -259,19 +259,25 @@ AC_DEFUN([WITH_GPP_DEFAULT_BEHAVIOR],
                 [],
                )
     default_behavior=GPP_LOCAL_FIRST
+    default_behavior_env=LOCAL_FIRST
     if test x"$with_gpp_default_behavior" = x"LOCAL_FIRST"; then
         AC_MSG_RESULT([Using gssproxy interposer behavior LOCAL_FIRST])
+	default_behavior=GPP_LOCAL_FIRST
+	default_behavior_env=LOCAL_FIRST
     elif test x"$with_gpp_default_behavior" = x"LOCAL_ONLY"; then
         AC_MSG_RESULT([Using gssproxy interposer behavior LOCAL_ONLY])
         default_behavior=GPP_LOCAL_ONLY
+	default_behavior_env=LOCAL_ONLY
     elif test x"$with_gpp_default_behavior" = x"REMOTE_FIRST"; then
         AC_MSG_RESULT([Using gssproxy interposer behavior REMOTE_FIRST])
         default_behavior=GPP_REMOTE_FIRST
+	default_behavior_env=REMOTE_FIRST
     elif test x"$with_gpp_default_behavior" = x"REMOTE_ONLY"; then
         AC_MSG_ERROR([REMOTE_ONLY currently not supported])
     elif test x"$with_gpp_default_behavior" != x; then
         AC_MSG_ERROR([unknown gpp default behavior])
     fi
+    AC_SUBST(GPP_DEFAULT_BEHAVIOR, $default_behavior_env)
     AC_DEFINE_UNQUOTED(GPP_DEFAULT_BEHAVIOR, $default_behavior, [Default gssproxy interposer plugin behavior])
   ])
 
diff --git a/proxy/man/gssproxy-mech.8.xml.in b/proxy/man/gssproxy-mech.8.xml.in
index 2249ced..52b1063 100644
--- a/proxy/man/gssproxy-mech.8.xml.in
+++ b/proxy/man/gssproxy-mech.8.xml.in
@@ -85,9 +85,6 @@
                         to immediately reenter the GSSAPI. When the local
                         GSSAPI cannot process the request, it will resend the
                         request to the gssproxy daemon.
-                        This is the default behavior when the
-                        <emphasis>GSSPROXY_BEHAVIOR</emphasis> environment
-                        variable is not set.
                     </para>
                 </listitem>
             </varlistentry>
@@ -110,6 +107,11 @@
                 </listitem>
             </varlistentry>
         </variablelist>
+        <para>
+                The default setting for <emphasis>GSSPROXY_BEHAVIOR</emphasis>
+                is @GPP_DEFAULT_BEHAVIOR@.
+        </para>
+
         <para>
             Finally the interposer may need to use a special per-service
             socket in order to communicate with gssproxy. The path to this
-- 
cgit