From 2fe5085b11511198a18aac9cb879b16f4f1d703d Mon Sep 17 00:00:00 2001 From: rufustfirefly Date: Mon, 25 Jun 2001 18:17:49 +0000 Subject: [PATCH] fixed DISABLE_SHELLCHECK support in afpd and papd (Jason Keltz ) --- ChangeLog | 5 ++++- etc/afpd/uam.c | 4 ++-- etc/papd/uam.c | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c537672e..866d1550 100644 --- 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 * 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 ) + 2001-06-20 jeff b * 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 0b5dfaf9..e2867b1d 100644 --- 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 c332685e..f99a847d 100644 --- 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; } -- 2.39.2