Removed the --disable-chkpwd option, because it generates

a system that fails to build.  (The non-chkpwd version of validpw() was
removed a long time ago.)

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index c3d1c901e43c857dd7f2bff7d62b090f78694b20..f77df0f7226eaa946c36a559a04fec4838ae527b 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -13,7 +13,6 @@
 ########################################################################
 
 TARGETS=@TARGETS@
-CHKPWD=@CHKPWD@
 RUN_DIR=@MAKE_RUN_DIR@
 SPOOL_DIR=@MAKE_SPOOL_DIR@
 ETC_DIR=@MAKE_ETC_DIR@
@@ -28,7 +27,7 @@ all: $(TARGETS)
 EXEEXT=@EXEEXT@
 
 CLIENT_TARGETS=citadel$(EXEEXT) whobbs$(EXEEXT) stress$(EXEEXT)
-SERVER_TARGETS=citserver $(CHKPWD)
+SERVER_TARGETS=citserver chkpwd
 SERV_MODULES=serv_chat.o \
        serv_upgrade.o \
        serv_smtp.o \

diff --git a/citadel/configure.ac b/citadel/configure.ac
index 19d77ed05d85c480535c2b4118cc67c659d8f3e2..6bc7ce43ee83d010a46aa245d812cd51828be7e5 100644 (file)
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -332,14 +332,6 @@ dnl (Linux shadow passwords)
                                        LIBS="-lcrypt $LIBS"])
                fi
        fi
-       if test "$ac_cv_func_crypt" = yes -o "$ac_cv_lib_crypt_crypt" = yes -o "$ac_cv_func_pam_start" = yes; then
-               if test "$enable_chkpwd" != no; then
-                       AC_DEFINE(ENABLE_CHKPWD, [], [define this to enable use of the chkpwd program (for shadow passwords)])
-                       CHKPWD=chkpwd
-               else
-                       AUTH=auth.lo
-               fi
-       fi
 
 test -f /usr/local/lib/libresolv.a && LDFLAGS="$LDFLAGS -L/usr/local/lib"
 AC_CHECK_LIB(resolv, res_query, RESOLV="$RESOLV -lresolv")
@@ -780,7 +772,6 @@ AC_CACHE_CHECK([under the bed], ac_cv_under_the_bed, [
 
 dnl Done! Now write the Makefile and sysdep.h
 AC_SUBST(AUTH)
-AC_SUBST(CHKPWD)
 AC_SUBST(RESOLV)
 AC_SUBST(chkpwd_LIBS)
 AC_SUBST(TARGETS)

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index a56fddcbeec0b205a9ed08a551e42edfba31548f..f21521c756b9dfd0034d62e3fb5b458db24d9aeb 100644 (file)
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -30,9 +30,7 @@
 
 #include <string.h>
 #include <limits.h>
-#ifndef ENABLE_CHKPWD
 #include "auth.h"
-#endif
 #include "citadel.h"
 #include "server.h"
 #include "database.h"
@@ -580,10 +578,8 @@ void logout(struct CitContext *who)
        }
 }
 
-#ifdef ENABLE_CHKPWD
 /*
- * an alternate version of validpw() which executes `chkpwd' instead of
- * verifying the password directly
+ * Validate a password on the host unix system by calling the 'chkpwd' utility
  */
 static int validpw(uid_t uid, const char *pass)
 {
@@ -636,7 +632,6 @@ static int validpw(uid_t uid, const char *pass)
 
        return 0;
 }
-#endif
 
 void do_login()
 {