From a0254318ee50f13b858a239766ff42b63eff9452 Mon Sep 17 00:00:00 2001 From: Uriel Date: Mon, 9 Mar 2009 22:08:22 +0000 Subject: [PATCH] Fix a bug where check_user would not work properly when called from config files. --- bin/werclib.rc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/werclib.rc b/bin/werclib.rc index 132e5ff..63bc9ba 100644 --- a/bin/werclib.rc +++ b/bin/werclib.rc @@ -26,10 +26,11 @@ fn login_user { # Check login status, if called with group arg we check membership too fn check_user { get_user + g=($* admin) _status=$status if(! ~ $"_status '') _status=(Not logged in: $"_status) - if not if(! ~ $#* 0 && ! ~ $logged_user $* && ! grep -s '^'^$logged_user^'$' etc/users/$*/members etc/users/admin/members >[2]/dev/null) + if not if(! ~ $#* 0 && ! ~ $logged_user $* && ! grep -s '^'^$logged_user^'$' $werc_root/etc/users/$g/members >[2]/dev/null) _status=(User $logged_user not in: $*) status=$_status } @@ -63,7 +64,7 @@ fn auth_user { user_name=$1 user_password=$2 - pfile='etc/users/'^$"user_name^'/password' + pfile=$werc_root/etc/users/$"user_name/password if(~ $#user_name 0 || ~ $#user_password 0) status=('Auth: missing user name or pass: '^$"user_name^' / '^$"user_password) if not if(! test -f $pfile)