fixed DISABLE_SHELLCHECK support in afpd and papd (Jason Keltz <jas@cs.yorku.ca>)

diff --git a/ChangeLog b/ChangeLog
index c537672e6ba20a16c4e9f741e75842872ef4bc8c..866d15501f98b30221c25ae38fe490e8ff38cc31 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-($Id: ChangeLog,v 1.52 2001-06-25 15:18:00 rufustfirefly Exp $)
+($Id: ChangeLog,v 1.53 2001-06-25 18:17:49 rufustfirefly Exp $)
 
 2001-06-25  jeff b  <jeff@univrel.pr.uconn.edu>
        * etc/afpd/auth.c, etc/afpd/main.c, etc/afpd/uam.c,
@@ -7,6 +7,9 @@
        any security scheme to be used on the TRU64 side (Burkhard
        Schmidt)
 
+       * etc/afpd/uam.c, etc/papd/uam.c: fixed DISABLE_SHELLCHECK
+       support in both afpd and papd (Jason Keltz <jas@cs.yorku.ca>)
+
 2001-06-20  jeff b  <jeff@univrel.pr.uconn.edu>
        * configure.in: check for linux/quota.h before enabling
        QUOTACTL_WRAPPER (Joe Clarke) 

diff --git a/etc/afpd/uam.c b/etc/afpd/uam.c
index 0b5dfaf9214286c645bf56204c1ab9ae4a44d01a..e2867b1dcc21b3c30f2e7336c2b2c4d2f80d718d 100644 (file)
--- a/etc/afpd/uam.c
+++ b/etc/afpd/uam.c
@@ -1,5 +1,5 @@
 /*
- * $Id: uam.c,v 1.10 2001-06-25 15:18:01 rufustfirefly Exp $
+ * $Id: uam.c,v 1.11 2001-06-25 18:17:49 rufustfirefly Exp $
  *
  * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved.  See COPYRIGHT.
@@ -232,7 +232,7 @@ int uam_checkuser(const struct passwd *pwd)
   }
   endusershell();
 
-#ifdef DISABLE_SHELLCHECK
+#ifndef DISABLE_SHELLCHECK
   if (!p) {
     syslog( LOG_INFO, "illegal shell %s for %s", pwd->pw_shell, pwd->pw_name);
     return -1;

diff --git a/etc/papd/uam.c b/etc/papd/uam.c
index c332685e9be810454bf4ebd888417849786d7e12..f99a847d518e1e4a2b4384aa37230ef4b991a18a 100644 (file)
--- a/etc/papd/uam.c
+++ b/etc/papd/uam.c
@@ -217,10 +217,12 @@ int uam_checkuser(const struct passwd *pwd)
   }
   endusershell();
 
+#ifndef 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;
 }