dont pass --no-unlog if afs is not configured. Patch partly from Eray Asian
This commit is contained in:
@@ -246,6 +246,7 @@ AC_ARG_ENABLE([afs-support],
|
|||||||
if test "$enable_afs_support" = no; then
|
if test "$enable_afs_support" = no; then
|
||||||
AC_DEFINE(NO_AFS, 1, [Define if you don't wan't support for AFS.])
|
AC_DEFINE(NO_AFS, 1, [Define if you don't wan't support for AFS.])
|
||||||
fi
|
fi
|
||||||
|
AC_SUBST(NO_AFS)dnl
|
||||||
|
|
||||||
rk_DB
|
rk_DB
|
||||||
|
|
||||||
|
@@ -8,7 +8,8 @@ do_subst = \
|
|||||||
sed $(do_dlopen) \
|
sed $(do_dlopen) \
|
||||||
-e "s,[@]EGREP[@],$(EGREP),g" \
|
-e "s,[@]EGREP[@],$(EGREP),g" \
|
||||||
-e "s,[@]top_srcdir[@],$${top_srcdir},g" \
|
-e "s,[@]top_srcdir[@],$${top_srcdir},g" \
|
||||||
-e "s,[@]top_builddir[@],$${top_builddir},g"
|
-e "s,[@]top_builddir[@],$${top_builddir},g" \
|
||||||
|
-e "s,[@]NO_AFS[@],$${NO_AFS},g"
|
||||||
|
|
||||||
setup-env: setup-env.in Makefile
|
setup-env: setup-env.in Makefile
|
||||||
$(do_subst) < $(srcdir)/setup-env.in > setup-env.tmp
|
$(do_subst) < $(srcdir)/setup-env.in > setup-env.tmp
|
||||||
|
@@ -6,6 +6,7 @@ unset KRB5CCNAME
|
|||||||
top_builddir="@top_builddir@"
|
top_builddir="@top_builddir@"
|
||||||
top_srcdir="@top_srcdir@"
|
top_srcdir="@top_srcdir@"
|
||||||
EGREP="@EGREP@"
|
EGREP="@EGREP@"
|
||||||
|
NO_AFS="@NO_AFS@"
|
||||||
|
|
||||||
# Meant to be sourced (source or .) by the tester application, offers
|
# Meant to be sourced (source or .) by the tester application, offers
|
||||||
# most commands in heimdal as variables
|
# most commands in heimdal as variables
|
||||||
|
@@ -52,7 +52,7 @@ port=@port@
|
|||||||
pwport=@pwport@
|
pwport=@pwport@
|
||||||
|
|
||||||
kinit="${kinit} --password-file=${objdir}/foopassword --no-afslog"
|
kinit="${kinit} --password-file=${objdir}/foopassword --no-afslog"
|
||||||
kdestroy="${kdestroy} --no-unlog"
|
test ! "${NO_AFS}" && kdestroy="${kdestroy} --no-unlog"
|
||||||
kadmin="${kadmin} -l -r $R"
|
kadmin="${kadmin} -l -r $R"
|
||||||
kdc="${kdc} --addresses=localhost -P $port"
|
kdc="${kdc} --addresses=localhost -P $port"
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user