* returns 0 on success
*/
int getuser(struct ctdluser *usbuf, char name[])
+{
+ return CtdlGetUser(usbuf, name);
+}
+
+
+/*
+ * CtdlGetUser() - retrieve named user into supplied buffer.
+ * returns 0 on success
+ */
+int CtdlGetUser(struct ctdluser *usbuf, char name[])
{
char usernamekey[USERNAME_SIZE];
/*
- * lgetuser() - same as getuser() but locks the record
+ * CtdlGetUserLock() - same as getuser() but locks the record
*/
-int lgetuser(struct ctdluser *usbuf, char *name)
+int CtdlGetUserLock(struct ctdluser *usbuf, char *name)
{
int retcode;
- retcode = getuser(usbuf, name);
+ retcode = CtdlGetUser(usbuf, name);
if (retcode == 0) {
begin_critical_section(S_USERS);
}
/*
- * putuser() - write user buffer into the correct place on disk
+ * lgetuser() - same as getuser() but locks the record
*/
-void putuser(struct ctdluser *usbuf)
+int lgetuser(struct ctdluser *usbuf, char *name)
+{
+ return CtdlGetUserLock(usbuf, name);
+}
+
+
+/*
+ * CtdlPutUser() - write user buffer into the correct place on disk
+ */
+void CtdlPutUser(struct ctdluser *usbuf)
{
char usernamekey[USERNAME_SIZE];
}
+/*
+ * putuser() - write user buffer into the correct place on disk
+ */
+void putuser(struct ctdluser *usbuf)
+{
+ CtdlPutUser(usbuf);
+}
+
+
+/*
+ * CtdlPutUserLock() - same as putuser() but locks the record
+ */
+void CtdlPutUserLock(struct ctdluser *usbuf)
+{
+ CtdlPutUser(usbuf);
+ end_critical_section(S_USERS);
+}
+
+
/*
* lputuser() - same as putuser() but locks the record
*/
void lputuser(struct ctdluser *usbuf)
{
- putuser(usbuf);
- end_critical_section(S_USERS);
+ CtdlPutUserLock(usbuf);
}
/* Lock up and get going */
begin_critical_section(S_USERS);
- if (getuser(&usbuf, newname) == 0) {
+ if (CtdlGetUser(&usbuf, newname) == 0) {
retcode = RENAMEUSER_ALREADY_EXISTS;
}
else {
- if (getuser(&usbuf, oldname) != 0) {
+ if (CtdlGetUser(&usbuf, oldname) != 0) {
retcode = RENAMEUSER_NOT_FOUND;
}
CtdlLogPrintf(CTDL_DEBUG, "Renaming <%s> to <%s>\n", oldname, newname);
cdb_delete(CDB_USERS, oldnamekey, strlen(oldnamekey));
safestrncpy(usbuf.fullname, newname, sizeof usbuf.fullname);
- putuser(&usbuf);
+ CtdlPutUser(&usbuf);
cdb_store(CDB_USERSBYNUMBER, &usbuf.usernum, sizeof(long),
usbuf.fullname, strlen(usbuf.fullname)+1 );
}
/*
- * getuserbynumber() - get user by number
+ * CtdlGetUserByNumber() - get user by number
* returns 0 if user was found
*
* Note: fetching a user this way requires one additional database operation.
*/
-int getuserbynumber(struct ctdluser *usbuf, long number)
+int CtdlGetUserByNumber(struct ctdluser *usbuf, long number)
{
struct cdbdata *cdbun;
int r;
}
CtdlLogPrintf(CTDL_INFO, "User %ld maps to %s\n", number, cdbun->ptr);
- r = getuser(usbuf, cdbun->ptr);
+ r = CtdlGetUser(usbuf, cdbun->ptr);
cdb_free(cdbun);
return(r);
}
+/*
+ * getuserbynumber() - get user by number
+ * returns 0 if user was found
+ *
+ * Note: fetching a user this way requires one additional database operation.
+ */
+int getuserbynumber(struct ctdluser *usbuf, long number)
+{
+ return CtdlGetUserByNumber(usbuf, number);
+}
+
/*
struct recptypes *valid = NULL;
/* First, try to log in as if the supplied name is a display name */
- found_user = getuser(&CC->user, username);
+ found_user = CtdlGetUser(&CC->user, username);
/* If that didn't work, try to log in as if the supplied name
* is an e-mail address
valid = validate_recipients(username, NULL, 0);
if (valid != NULL) {
if (valid->num_local == 1) {
- found_user = getuser(&CC->user, valid->recp_local);
+ found_user = CtdlGetUser(&CC->user, valid->recp_local);
}
free_recipients(valid);
}
CC->logged_in = 1;
CtdlLogPrintf(CTDL_NOTICE, "<%s> logged in\n", CC->curr_user);
- lgetuser(&CC->user, CC->curr_user);
+ CtdlGetUserLock(&CC->user, CC->curr_user);
++(CC->user.timescalled);
CC->previous_login = CC->user.lastcall;
time(&CC->user.lastcall);
}
}
- lputuser(&CC->user);
+ CtdlPutUserLock(&CC->user);
/*
* Populate CC->cs_inet_email with a default address. This will be
CtdlLogPrintf(CTDL_WARNING, "CtdlTryPassword: no user selected\n");
return pass_no_user;
}
- if (getuser(&CC->user, CC->curr_user)) {
+ if (CtdlGetUser(&CC->user, CC->curr_user)) {
CtdlLogPrintf(CTDL_ERR, "CtdlTryPassword: internal error\n");
return pass_internal_error;
}
* this is a security hazard, comment it out.
*/
- lgetuser(&CC->user, CC->curr_user);
+ CtdlGetUserLock(&CC->user, CC->curr_user);
safestrncpy(CC->user.password, password, sizeof CC->user.password);
- lputuser(&CC->user);
+ CtdlPutUserLock(&CC->user);
/*
* (sooper-seekrit hack ends here)
if (IsEmptyStr(pname))
return (ERROR + NO_SUCH_USER);
- if (getuser(&usbuf, pname) != 0) {
+ if (CtdlGetUser(&usbuf, pname) != 0) {
CtdlLogPrintf(CTDL_ERR, "Cannot purge user <%s> - not found\n", pname);
return (ERROR + NO_SUCH_USER);
}
if (user_is_logged_in == 1) {
CtdlLogPrintf(CTDL_WARNING, "User <%s> is logged in; not deleting.\n", pname);
usbuf.axlevel = 0;
- putuser(&usbuf);
+ CtdlPutUser(&usbuf);
return (1);
}
CtdlLogPrintf(CTDL_NOTICE, "Deleting user <%s>\n", pname);
int internal_create_user (char *username, struct ctdluser *usbuf, uid_t uid)
{
- if (!getuser(usbuf, username)) {
+ if (!CtdlGetUser(usbuf, username)) {
return (ERROR + ALREADY_EXISTS);
}
usbuf->usernum = get_new_user_number();
/* add user to the database */
- putuser(usbuf);
+ CtdlPutUser(usbuf);
cdb_store(CDB_USERSBYNUMBER, &usbuf->usernum, sizeof(long), usbuf->fullname, strlen(usbuf->fullname)+1);
return 0;
do_login();
/* Check to make sure we're still who we think we are */
- if (getuser(&CC->user, CC->curr_user)) {
+ if (CtdlGetUser(&CC->user, CC->curr_user)) {
return (ERROR + INTERNAL_ERROR);
}
}
*/
void CtdlSetPassword(char *new_pw)
{
- lgetuser(&CC->user, CC->curr_user);
+ CtdlGetUserLock(&CC->user, CC->curr_user);
safestrncpy(CC->user.password, new_pw, sizeof(CC->user.password));
- lputuser(&CC->user);
+ CtdlPutUserLock(&CC->user);
CtdlLogPrintf(CTDL_INFO, "Password changed for user <%s>\n", CC->curr_user);
PerformSessionHooks(EVT_SETPASS);
}
if (a == 0) {
if (!IsEmptyStr(password)) {
- lgetuser(&tmp, username);
+ CtdlGetUserLock(&tmp, username);
safestrncpy(tmp.password, password, sizeof(tmp.password));
- lputuser(&tmp);
+ CtdlPutUserLock(&tmp);
}
cprintf("%d User '%s' created %s.\n", CIT_OK, username,
(!IsEmptyStr(password)) ? "and password set" :
if (CtdlAccessCheck(ac_logged_in))
return;
- getuser(&CC->user, CC->curr_user);
+ CtdlGetUser(&CC->user, CC->curr_user);
cprintf("%d %d|%d|%d|\n",
CIT_OK,
CC->user.USscreenwidth,
cprintf("%d Usage error.\n", ERROR + ILLEGAL_VALUE);
return;
}
- lgetuser(&CC->user, CC->curr_user);
+ CtdlGetUserLock(&CC->user, CC->curr_user);
CC->user.USscreenwidth = extract_int(new_parms, 0);
CC->user.USscreenheight = extract_int(new_parms, 1);
CC->user.flags = CC->user.flags & (~US_USER_SET);
CC->user.flags = CC->user.flags |
(extract_int(new_parms, 2) & US_USER_SET);
- lputuser(&CC->user);
+ CtdlPutUserLock(&CC->user);
cprintf("%d Ok\n", CIT_OK);
}
newlr = atol(new_ptr);
}
- lgetuser(&CC->user, CC->curr_user);
+ CtdlGetUserLock(&CC->user, CC->curr_user);
CtdlGetRelationship(&vbuf, &CC->user, &CC->room);
memcpy(&original_vbuf, &vbuf, sizeof(struct visit));
CtdlSetRelationship(&vbuf, &CC->user, &CC->room);
}
- lputuser(&CC->user);
+ CtdlPutUserLock(&CC->user);
cprintf("%d %ld\n", CIT_OK, newlr);
}
struct visit vbuf;
char bbb[SIZ];
- if (getuser(&USscratch, iuser) != 0) {
+ if (CtdlGetUser(&USscratch, iuser) != 0) {
return(1);
}
return(1);
}
- lgetuser(&CC->user, CC->curr_user);
+ CtdlGetUserLock(&CC->user, CC->curr_user);
CtdlGetRelationship(&vbuf, &CC->user, &CC->room);
vbuf.v_flags = vbuf.v_flags | V_FORGET;
vbuf.v_flags = vbuf.v_flags & ~V_ACCESS;
CtdlSetRelationship(&vbuf, &CC->user, &CC->room);
- lputuser(&CC->user);
+ CtdlPutUserLock(&CC->user);
/* Return to the Lobby, so we don't end up in an undefined room */
CtdlUserGoto(config.c_baseroom, 0, 0, NULL, NULL);
return;
}
- if (lgetuser(&userbuf, user) != 0) {
+ if (CtdlGetUserLock(&userbuf, user) != 0) {
cprintf("%d '%s' not found.\n", ERROR + NO_SUCH_USER, user);
return;
}
userbuf.axlevel = newax;
userbuf.flags = (userbuf.flags & ~US_NEEDVALID);
- lputuser(&userbuf);
+ CtdlPutUserLock(&userbuf);
/* If the access level was set to zero, delete the user */
if (newax == 0) {
return;
}
- getuser(&CC->user, CC->curr_user); /* no lock is needed here */
+ CtdlGetUser(&CC->user, CC->curr_user); /* no lock is needed here */
if ((REGISCALL != 0) && ((CC->user.flags & US_REGIS) == 0))
regis = 1;
{
struct ctdluser usbuf;
- if (getuser(&usbuf, who) == 0) {
+ if (CtdlGetUser(&usbuf, who) == 0) {
cprintf("%d %s\n", CIT_OK, usbuf.fullname);
} else {
cprintf("%d No such user.\n", ERROR + NO_SUCH_USER);
}
extract_token(requested_user, cmdbuf, 0, '|', sizeof requested_user);
- if (getuser(&usbuf, requested_user) != 0) {
+ if (CtdlGetUser(&usbuf, requested_user) != 0) {
cprintf("%d No such user.\n", ERROR + NO_SUCH_USER);
return;
}
return;
extract_token(requested_user, cmdbuf, 0, '|', sizeof requested_user);
- if (lgetuser(&usbuf, requested_user) != 0) {
+ if (CtdlGetUserLock(&usbuf, requested_user) != 0) {
cprintf("%d No such user.\n", ERROR + NO_SUCH_USER);
return;
}
if (np > 8) {
usbuf.USuserpurge = extract_int(cmdbuf, 8);
}
- lputuser(&usbuf);
+ CtdlPutUserLock(&usbuf);
if (usbuf.axlevel == 0) {
if (purge_user(requested_user) == 0) {
deleted = 1;