projects
/
citadel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add function to lock the current user.
[citadel.git]
/
citadel
/
modules
/
ctdlproto
/
serv_user.c
diff --git
a/citadel/modules/ctdlproto/serv_user.c
b/citadel/modules/ctdlproto/serv_user.c
index eee6516b864d0af2be766d0ce9f89e8d4f650269..5a7162977c717e91f5a2decbffa3d77d420c4670 100644
(file)
--- a/
citadel/modules/ctdlproto/serv_user.c
+++ b/
citadel/modules/ctdlproto/serv_user.c
@@
-270,10
+270,10
@@
void cmd_setu(char *new_parms)
cprintf("%d Usage error.\n", ERROR + ILLEGAL_VALUE);
return;
}
cprintf("%d Usage error.\n", ERROR + ILLEGAL_VALUE);
return;
}
- Ctdl
GetUserLock(&CC->user, CC->curr_user
);
+ Ctdl
LockGetCurrentUser(
);
CC->user.flags = CC->user.flags & (~US_USER_SET);
CC->user.flags = CC->user.flags | (extract_int(new_parms, 2) & US_USER_SET);
CC->user.flags = CC->user.flags & (~US_USER_SET);
CC->user.flags = CC->user.flags | (extract_int(new_parms, 2) & US_USER_SET);
- CtdlPut
UserLock(&CC->user
);
+ CtdlPut
CurrentUserLock(
);
cprintf("%d Ok\n", CIT_OK);
}
cprintf("%d Ok\n", CIT_OK);
}
@@
-296,7
+296,7
@@
void cmd_slrp(char *new_ptr)
newlr = atol(new_ptr);
}
newlr = atol(new_ptr);
}
- Ctdl
GetUserLock(&CC->user, CC->curr_user
);
+ Ctdl
LockGetCurrentUser(
);
CtdlGetRelationship(&vbuf, &CC->user, &CC->room);
memcpy(&original_vbuf, &vbuf, sizeof(visit));
CtdlGetRelationship(&vbuf, &CC->user, &CC->room);
memcpy(&original_vbuf, &vbuf, sizeof(visit));
@@
-309,7
+309,7
@@
void cmd_slrp(char *new_ptr)
CtdlSetRelationship(&vbuf, &CC->user, &CC->room);
}
CtdlSetRelationship(&vbuf, &CC->user, &CC->room);
}
- CtdlPut
UserLock(&CC->user
);
+ CtdlPut
CurrentUserLock(
);
cprintf("%d %ld\n", CIT_OK, newlr);
}
cprintf("%d %ld\n", CIT_OK, newlr);
}