X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fuser_ops.c;h=92cf99e24c8164c65cf316ac6ac59f60afbaa68e;hp=270ca87dbe48590d1093f81e34cee0c5b226dec9;hb=b11aa21e7968de3591f30d7af1ba561fab7bc53f;hpb=f5e736bd90d98004e7ae0af0415b9f88b956cfff

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index 270ca87db..92cf99e24 100644
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -29,17 +29,6 @@ int chkpwd_write_pipe[2];
 int chkpwd_read_pipe[2];
 
 
-
-/*
- * getuser()  -  retrieve named user into supplied buffer.
- *	       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
@@ -76,6 +65,12 @@ int CtdlGetUser(struct ctdluser *usbuf, char *name)
 	return CtdlGetUserLen(usbuf, name, cutuserkey(name));
 }
 
+int CtdlLockGetCurrentUser(void)
+{
+	CitContext *CCC = CC;
+
+	return CtdlGetUserLen(&CCC->user, CCC->curr_user, cutuserkey(CCC->curr_user));
+}
 
 /*
  * CtdlGetUserLock()  -  same as getuser() but locks the record
@@ -92,15 +87,6 @@ int CtdlGetUserLock(struct ctdluser *usbuf, char *name)
 }
 
 
-/*
- * lgetuser()  -  same as getuser() but locks the record
- */
-int lgetuser(struct ctdluser *usbuf, char *name)
-{
-	return CtdlGetUserLock(usbuf, name);
-}
-
-
 /*
  * CtdlPutUser()  -  write user buffer into the correct place on disk
  */
@@ -119,13 +105,9 @@ void CtdlPutUser(struct ctdluser *usbuf)
 
 }
 
-
-/*
- * putuser()  -  write user buffer into the correct place on disk
- */
-void putuser(struct ctdluser *usbuf)
+void CtdlPutCurrentUserLock()
 {
-	CtdlPutUser(usbuf);
+	CtdlPutUser(&CC->user);
 }
 
 
@@ -139,14 +121,6 @@ void CtdlPutUserLock(struct ctdluser *usbuf)
 }
 
 
-/*
- * lputuser()  -  same as putuser() but locks the record
- */
-void lputuser(struct ctdluser *usbuf)
-{
-	CtdlPutUserLock(usbuf);
-}
-
 
 /*
  * rename_user()  -  this is tricky because the user's display name is the database key
@@ -447,19 +421,6 @@ int CtdlGetUserByNumber(struct ctdluser *usbuf, long number)
 	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);
-}
-
-
-
 /*
  * Helper function for rebuild_usersbynumber()
  */