projects
/
citadel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renamed cutuserkey() to cutusername(). Function has nothing to do with keys.
[citadel.git]
/
citadel
/
user_ops.c
diff --git
a/citadel/user_ops.c
b/citadel/user_ops.c
index 168639ed91da8c3a93e6d84f2668e4c04c63b589..c5eeabd2cbca8bd9fec607d7d10fc542f15af69d 100644
(file)
--- a/
citadel/user_ops.c
+++ b/
citadel/user_ops.c
@@
-34,9
+34,9
@@
int chkpwd_read_pipe[2];
/*
/*
- *
Figure out what this does and make it cleaner
+ *
Trim a string down to the maximum username size and return the new length
*/
*/
-long cutuser
key
(char *username) {
+long cutuser
name
(char *username) {
long len;
len = strlen(username);
if (len >= USERNAME_SIZE)
long len;
len = strlen(username);
if (len >= USERNAME_SIZE)
@@
-75,7
+75,7
@@
int CtdlGetUser(struct ctdluser *usbuf, char *name)
{
char usernamekey[USERNAME_SIZE];
struct cdbdata *cdbus;
{
char usernamekey[USERNAME_SIZE];
struct cdbdata *cdbus;
- long len = cutuser
key
(name);
+ long len = cutuser
name
(name);
if (usbuf != NULL) {
memset(usbuf, 0, sizeof(struct ctdluser));
if (usbuf != NULL) {
memset(usbuf, 0, sizeof(struct ctdluser));
@@
-124,7
+124,7
@@
void CtdlPutUser(struct ctdluser *usbuf)
{
char usernamekey[USERNAME_SIZE];
{
char usernamekey[USERNAME_SIZE];
- makeuserkey(usernamekey, usbuf->fullname, cutuser
key
(usbuf->fullname));
+ makeuserkey(usernamekey, usbuf->fullname, cutuser
name
(usbuf->fullname));
usbuf->version = REV_LEVEL;
cdb_store(CDB_USERS, usernamekey, strlen(usernamekey), usbuf, sizeof(struct ctdluser));
}
usbuf->version = REV_LEVEL;
cdb_store(CDB_USERS, usernamekey, strlen(usernamekey), usbuf, sizeof(struct ctdluser));
}
@@
-160,8
+160,8
@@
int rename_user(char *oldname, char *newname) {
char newnamekey[USERNAME_SIZE];
/* Create the database keys... */
char newnamekey[USERNAME_SIZE];
/* Create the database keys... */
- makeuserkey(oldnamekey, oldname, cutuser
key
(oldname));
- makeuserkey(newnamekey, newname, cutuser
key
(newname));
+ makeuserkey(oldnamekey, oldname, cutuser
name
(oldname));
+ makeuserkey(newnamekey, newname, cutuser
name
(newname));
/* Lock up and get going */
begin_critical_section(S_USERS);
/* Lock up and get going */
begin_critical_section(S_USERS);
@@
-947,7
+947,7
@@
int purge_user(char pname[])
struct ctdluser usbuf;
char usernamekey[USERNAME_SIZE];
struct ctdluser usbuf;
char usernamekey[USERNAME_SIZE];
- makeuserkey(usernamekey, pname, cutuser
key
(pname));
+ makeuserkey(usernamekey, pname, cutuser
name
(pname));
/* If the name is empty we can't find them in the DB any way so just return */
if (IsEmptyStr(pname)) {
/* If the name is empty we can't find them in the DB any way so just return */
if (IsEmptyStr(pname)) {