+Tue Oct 11 23:13:53 EDT 2005 Art Cancro <ajc@uncensored.citadel.org>
+* Default for autologin is now DISABLED! If you are upgrading an existing
+ site and are using this function, you must --enable-autologin
+* newinstall.sh: --enable-autologin if upgrading an existing installation
+ that we think is set to autologin. It checks for chkpwd to find out.
+
Tue Oct 11 12:55:43 EDT 2005 Art Cancro <ajc@uncensored.citadel.org>
* The "set the flags" portion of IMAP COPY now sets the flags of all messages
in bulk, instead of one message at a time. Big performance boost.
-AC_ARG_ENABLE(autologin, [ --disable-autologin disable autologin (default is enabled if possible)])
+AC_ARG_ENABLE(autologin, [ --enable-autologin enable autologin (default is disabled)])
AC_ARG_ENABLE(chkpwd, [ --disable-chkpwd don't build 'chkpwd'])
AC_ARG_ENABLE(threaded-client, [ --disable-threaded-client
dnl Determine the system's authentication capabilities, if autologin is
dnl requested. We currently support PAM, standard getpwnam(), and getspnam()
dnl (Linux shadow passwords)
-if test "$enable_autologin" != no; then
+if test "$enable_autologin" = yes; then
if test "$with_pam" = yes; then
save_LIBS=$LIBS
AC_CHECK_LIB(pam, pam_start, [chkpwd_LIBS="-lpam $chkpwd_LIBS"
# CFLAGS C compiler flags
# LDFLAGS Linker flags
# IS_UPGRADE Set to "yes" if upgrading an existing Citadel
+# IS_AUTOLOGIN Set to "yes" to force enabling autologin
# CTDL_DIALOG Where (if at all) the "dialog" program may be found
# Let Citadel setup recognize the Citadel installer
cd $BUILD 2>&1 >>$LOG || die
( gzip -dc $CITADEL_SOURCE | tar -xvf - ) 2>&1 >>$LOG || die
cd $BUILD/citadel 2>&1 >>$LOG || die
+ if [ x$IS_AUTOLOGIN = xyes ] ; then
+ AL="--enable-autologin"
+ else
+ AL=""
+ fi
if [ -z "$OK_DB" ]
then
- ./configure --prefix=$CITADEL --with-db=$SUPPORT --with-pam --enable-autologin --with-libical --disable-threaded-client 2>&1 >>$LOG || die
+ ./configure --prefix=$CITADEL --with-db=$SUPPORT --with-pam $AL --with-libical --disable-threaded-client 2>&1 >>$LOG || die
else
- ./configure --prefix=$CITADEL --with-db=$OK_DB --with-pam --enable-autologin --with-libical --disable-threaded-client 2>&1 >>$LOG || die
+ ./configure --prefix=$CITADEL --with-db=$OK_DB --with-pam $AL --with-libical --disable-threaded-client 2>&1 >>$LOG || die
fi
$MAKE $MAKEOPTS 2>&1 >>$LOG || die
if [ $IS_UPGRADE = yes ]
if [ x$IS_UPGRADE == xyes ] ; then
echo Upgrading your existing Citadel installation.
- #$CITADEL/setup -q || die
$CITADEL/setup </dev/tty || die
else
echo This is a new Citadel installation.
cd $BUILD
+# 1B. Determine whether we are upgrading an autologin installation
+[ -x $CITADEL/chkpwd ] && {
+ IS_AUTOLOGIN="yes"
+}
+
+
# 2. Present the installation steps (from 1 above) to the user
clear
if dialog --clear </dev/tty ; then
echo "Configuration:"
echo "* Configure Citadel"
echo "* Configure WebCit"
+if [ x$IS_AUTOLOGIN = xyes ] ; then
+ echo 'NOTE: this is an autologin installation.'
+ echo ' Authentication against user accounts on the host system is enabled.'
+fi
echo ""
echo -n "Perform the above installation steps now? "
read yesno </dev/tty