patch from Jason Keitz (jkeitz@users.sourceforge.net) to disable checking for valid...

diff --git a/acconfig.h b/acconfig.h
index f65b891ca69e8b69f650649109494c92437b71de..f803e069e74aa83dbb7919ee5b0de2a8974994c1 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -7,6 +7,7 @@
 #undef CAPDIR
 #undef DEBUG
 #undef DLSYM_PREPEND_UNDERSCORE
+#undef DISABLE_SHELLCHECK
 #undef DROPKLUDGE
 #undef FHS_COMPATIBILITY
 #undef FORCE_UIDGID

diff --git a/configure.in b/configure.in
index ed1ff8f059aaa1c5664d310ab6a0135710bf28d1..0898d77ed665878845e3bab3cb2f85dc5425ed60 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -278,6 +278,14 @@ AC_ARG_WITH(shadow,
        shadowpw=yes
 )
 
+AC_ARG_ENABLE(shell-check,
+       [  --disable-shell-check   disable checking for a valid shell]
+       if test "$disableval" = "yes"; then 
+               AC_DEFINE(DISABLE_SHELLCHECK, 1)
+               AC_MSG_RESULT([disabling valid shell check])
+       fi
+)
+
 AC_ARG_WITH(flock-locks,
        [  --with-flock-locks      enable flock locks support],
        AC_MSG_RESULT([enabling flock locks])

diff --git a/etc/afpd/uam.c b/etc/afpd/uam.c
index 3d6b1605a2f28fbf920c957569f058aa82b16cd4..f554a1b8ba62c0878c1f2c15a62497f7c53b7811 100644 (file)
--- a/etc/afpd/uam.c
+++ b/etc/afpd/uam.c
@@ -1,4 +1,7 @@
-/* Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
+/*
+ * $Id: uam.c,v 1.7 2001-04-10 18:07:06 rufustfirefly Exp $
+ *
+ * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved.  See COPYRIGHT.
  */
 
@@ -217,10 +220,12 @@ int uam_checkuser(const struct passwd *pwd)
   }
   endusershell();
 
+#ifdef DISABLE_SHELLCHECK
   if (!p) {
     syslog( LOG_INFO, "illegal shell %s for %s", pwd->pw_shell, pwd->pw_name);
     return -1;
   }
+#endif /* DISABLE_SHELLCHECK */
 
   return 0;
 }