Skip to content

Commit e5141e1

Browse files
authored
Consistency in perms checks
1 parent 55f2296 commit e5141e1

1 file changed

Lines changed: 10 additions & 7 deletions

File tree

src/sysobj.moo

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,10 @@ object SYSOBJ
4141
endverb
4242

4343
verb "user_created user_connected" (this none this) owner: HACKER flags: "rxd"
44+
"...This code should only be run as a server task...";
45+
callers() && return E_PERM;
4446
user = args[1];
45-
if (callers())
46-
raise(E_PERM);
47-
endif
48-
if (args[1] < #0)
47+
if (user < #0)
4948
return;
5049
endif
5150
fork (0)
@@ -56,17 +55,21 @@ object SYSOBJ
5655
endverb
5756

5857
verb "user_disconnected user_client_disconnected" (this none this) owner: HACKER flags: "rxd"
59-
if (callers())
58+
"...This code should only be run as a server task...";
59+
callers() && return E_PERM;
60+
user = args[1];
61+
if (user < #0)
6062
return;
6163
endif
62-
user = args[1];
6364
fork (0)
6465
`user.location:disfunc(user) ! E_INVIND, E_VERBNF';
6566
endfork
6667
`user:disfunc() ! E_VERBNF';
6768
endverb
6869

6970
verb user_reconnected (this none this) owner: HACKER flags: "rxd"
71+
"...This code should only be run as a server task...";
72+
callers() && return E_PERM;
7073
user = args[1];
7174
if (user < #0)
7275
return;
@@ -79,4 +82,4 @@ object SYSOBJ
7982
endfork
8083
`user:anyconfunc() ! E_VERBNF';
8184
endverb
82-
endobject
85+
endobject

0 commit comments

Comments
 (0)