Skip to content

Commit 85c7e26

Browse files
committed
configure: error out if log or run dir is set to "no"
This can happen if the SUDO_VARDIR or SUDO_RUNDIR macros are unable to determine where to store the sudo var or run files.
1 parent f51b3e2 commit 85c7e26

File tree

2 files changed

+23
-17
lines changed

2 files changed

+23
-17
lines changed

configure

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33216,12 +33216,13 @@ esac
3321633216
fi
3321733217
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $sudo_cv_path_UTMP" >&5
3321833218
printf "%s\n" "$sudo_cv_path_UTMP" >&6; }
33219-
if test X"$sudo_cv_path_UTMP" != X"no"; then
33220-
cat >>confdefs.h <<EOF
33219+
if test X"$sudo_cv_path_UTMP" = X"no"; then
33220+
as_fn_error $? "Unable to determine utmp file location" "$LINENO" 5
33221+
fi
33222+
cat >>confdefs.h <<EOF
3322133223
#define _PATH_UTMP "$sudo_cv_path_UTMP"
3322233224
EOF
3322333225

33224-
fi
3322533226

3322633227
fi
3322733228

@@ -33345,16 +33346,17 @@ fi
3334533346
printf "%s\n" "$sudo_cv_run_dir" >&6; }
3334633347
rundir="$sudo_cv_run_dir"
3334733348
fi
33348-
if test X"$rundir" != X"no"; then
33349-
cat >>confdefs.h <<EOF
33349+
if test X"$rundir" = X"no"; then
33350+
as_fn_error $? "Unable to determine sudo run dir location, please specify --with-rundir" "$LINENO" 5
33351+
fi
33352+
cat >>confdefs.h <<EOF
3335033353
#define _PATH_SUDO_TIMEDIR "$rundir/ts"
3335133354
EOF
3335233355

33353-
cat >>confdefs.h <<EOF
33356+
cat >>confdefs.h <<EOF
3335433357
#define _PATH_SUDO_LOGSRVD_PID "$rundir/sudo_logsrvd.pid"
3335533358
EOF
3335633359

33357-
fi
3335833360

3335933361

3336033362
if test -n "$with_vardir"; then
@@ -33381,12 +33383,13 @@ fi
3338133383
printf "%s\n" "$sudo_cv_var_dir" >&6; }
3338233384
vardir="$sudo_cv_var_dir"
3338333385
fi
33384-
if test X"$vardir" != X"no"; then
33385-
cat >>confdefs.h <<EOF
33386+
if test X"$vardir" = X"no"; then
33387+
as_fn_error $? "Unable to determine sudo var dir location, please specify --with-vardir" "$LINENO" 5
33388+
fi
33389+
cat >>confdefs.h <<EOF
3338633390
#define _PATH_SUDO_LECTURE_DIR "$vardir/lectured"
3338733391
EOF
3338833392

33389-
fi
3339033393

3339133394

3339233395
if test "${with_iologdir-yes}" != "yes"; then

m4/sudo.m4

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,10 @@ AC_DEFUN([SUDO_PATH_UTMP], [
6767
fi
6868
done
6969
])
70-
if test X"$sudo_cv_path_UTMP" != X"no"; then
71-
SUDO_DEFINE_UNQUOTED(_PATH_UTMP, "$sudo_cv_path_UTMP")
70+
if test X"$sudo_cv_path_UTMP" = X"no"; then
71+
AC_MSG_ERROR([Unable to determine utmp file location])
7272
fi
73+
SUDO_DEFINE_UNQUOTED(_PATH_UTMP, "$sudo_cv_path_UTMP")
7374
])
7475

7576
dnl
@@ -138,10 +139,11 @@ AC_DEFUN([SUDO_RUNDIR], [
138139
])
139140
rundir="$sudo_cv_run_dir"
140141
fi
141-
if test X"$rundir" != X"no"; then
142-
SUDO_DEFINE_UNQUOTED(_PATH_SUDO_TIMEDIR, "$rundir/ts")
143-
SUDO_DEFINE_UNQUOTED(_PATH_SUDO_LOGSRVD_PID, "$rundir/sudo_logsrvd.pid")
142+
if test X"$rundir" = X"no"; then
143+
AC_MSG_ERROR([Unable to determine sudo run dir location, please specify --with-rundir])
144144
fi
145+
SUDO_DEFINE_UNQUOTED(_PATH_SUDO_TIMEDIR, "$rundir/ts")
146+
SUDO_DEFINE_UNQUOTED(_PATH_SUDO_LOGSRVD_PID, "$rundir/sudo_logsrvd.pid")
145147
])
146148

147149
dnl
@@ -162,9 +164,10 @@ AC_DEFUN([SUDO_VARDIR], [
162164
])
163165
vardir="$sudo_cv_var_dir"
164166
fi
165-
if test X"$vardir" != X"no"; then
166-
SUDO_DEFINE_UNQUOTED(_PATH_SUDO_LECTURE_DIR, "$vardir/lectured")
167+
if test X"$vardir" = X"no"; then
168+
AC_MSG_ERROR([Unable to determine sudo var dir location, please specify --with-vardir])
167169
fi
170+
SUDO_DEFINE_UNQUOTED(_PATH_SUDO_LECTURE_DIR, "$vardir/lectured")
168171
])
169172

170173
dnl

0 commit comments

Comments
 (0)