summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGünther Deschner <gdeschner@redhat.com>2013-10-17 18:53:07 +0200
committerGünther Deschner <gdeschner@redhat.com>2013-10-17 18:53:47 +0200
commit9b5b78f94a8ae468a8a2fd6a16e6c5b1a0f52472 (patch)
tree9de2ac50ae6a7c8994a055f8c25707694da7e9d0
parent08173993ff56ff8552575dc1ef321f30e33d900c (diff)
downloadgss-proxy-master-fixes3.tar.gz
gss-proxy-master-fixes3.tar.xz
gss-proxy-master-fixes3.zip
docs: Fill in GSSPROXY_BEHAVIOR default setting from configure option.master-fixes3
Signed-off-by: Günther Deschner <gdeschner@redhat.com>
-rw-r--r--proxy/conf_macros.m46
-rw-r--r--proxy/man/gssproxy-mech.8.xml.in10
2 files changed, 12 insertions, 4 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 b2d008c..52b1063 100644
--- a/proxy/man/gssproxy-mech.8.xml.in
+++ b/proxy/man/gssproxy-mech.8.xml.in
@@ -74,10 +74,7 @@
<para>All commands received with this setting will cause
to immediately reenter the GSSAPI w/o any interaction
with the gssproxy daemon. When the request cannot be
- processed it will just fail. This is the default
- behavior when the
- <emphasis>GSSPROXY_BEHAVIOR</emphasis> environment
- variable is not set at all.
+ processed it will just fail.
</para>
</listitem>
</varlistentry>
@@ -111,6 +108,11 @@
</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
socket is set via the <emphasis>GSSPROXY_SOCKET</emphasis>