q/thirdculture-werc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix a bug where check_user would not work properly when called from config files.

Browse source
This commit is contained in:
Uriel 2009-03-09 22:08:22 +00:00
parent b1df2966e3
commit a0254318ee
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
bin/werclib.rc
View file

@ -26,10 +26,11 @@ fn login_user {
# Check login status, if called with group arg we check membership too # Check login status, if called with group arg we check membership too
fn check_user { fn check_user {
get_user get_user
g=($* admin)
_status=$status _status=$status
if(! ~ $"_status '') if(! ~ $"_status '')
_status=(Not logged in: $"_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=(User $logged_user not in: $*)
status=$_status status=$_status
} }
@ -63,7 +64,7 @@ fn auth_user {
user_name=$1 user_name=$1
user_password=$2 user_password=$2
pfile='etc/users/'^$"user_name^'/password' pfile=$werc_root/etc/users/$"user_name/password
if(~ $#user_name 0 || ~ $#user_password 0) if(~ $#user_name 0 || ~ $#user_password 0)
status=('Auth: missing user name or pass: '^$"user_name^' / '^$"user_password) status=('Auth: missing user name or pass: '^$"user_name^' / '^$"user_password)
if not if(! test -f $pfile) if not if(! test -f $pfile)