Commit 1715683f authored by Robert Ricci's avatar Robert Ricci

Delay putting OURDOMAIN into confdefs.h until after the code to

intuit the default value from BOSSNODE .
parent 294f79d9
......@@ -982,10 +982,6 @@ cat >> confdefs.h <<EOF
#define FSNODE "$FSNODE"
EOF
cat >> confdefs.h <<EOF
#define OURDOMAIN "$OURDOMAIN"
EOF
cat >> confdefs.h <<EOF
#define FSDIR_PROJ "$FSDIR_PROJ"
EOF
......@@ -1067,6 +1063,10 @@ fi
if test -z "$OURDOMAIN"; then
OURDOMAIN="`echo $BOSSNODE | sed -E -e 's/^[a-zA-Z0-9\-]+\.//'`"
fi
cat >> confdefs.h <<EOF
#define OURDOMAIN "$OURDOMAIN"
EOF
if test -z "$TBAUTHDOMAIN"; then
TBAUTHDOMAIN=".$OURDOMAIN"
......
......@@ -145,7 +145,6 @@ AC_DEFINE_UNQUOTED(JAILIPMASK, "$JAILIPMASK")
AC_DEFINE_UNQUOTED(BOSSNODE, "$BOSSNODE")
AC_DEFINE_UNQUOTED(USERNODE, "$USERNODE")
AC_DEFINE_UNQUOTED(FSNODE, "$FSNODE")
AC_DEFINE_UNQUOTED(OURDOMAIN, "$OURDOMAIN")
AC_DEFINE_UNQUOTED(FSDIR_PROJ, "$FSDIR_PROJ")
AC_DEFINE_UNQUOTED(FSDIR_GROUPS, "$FSDIR_GROUPS")
AC_DEFINE_UNQUOTED(FSDIR_USERS, "$FSDIR_USERS")
......@@ -214,6 +213,7 @@ if test -z "$OURDOMAIN"; then
OURDOMAIN="`echo $BOSSNODE | sed -E -e 's/^[a-zA-Z0-9\-]+\.//'`"
fi
changequote([, ])dnl
AC_DEFINE_UNQUOTED(OURDOMAIN, "$OURDOMAIN")
if test -z "$TBAUTHDOMAIN"; then
TBAUTHDOMAIN=".$OURDOMAIN"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment