A few more API clean ups. Mainly revolving around user_ops.c

[citadel.git] / citadel / user_ops.h

diff --git a/citadel/user_ops.h b/citadel/user_ops.h
index 79bc46bb52d6ff645de2160e7a6ac3f891617630..1a61e34dcd633f2223cf77a2cc345c1085590b60 100644 (file)
--- a/citadel/user_ops.h
+++ b/citadel/user_ops.h
@@ -1,50 +1,46 @@
 /* $Id$ */
 int hash (char *str);
-int getuser (struct usersupp *, char *);
-int lgetuser (struct usersupp *, char *);
-void putuser (struct usersupp *);
-void lputuser (struct usersupp *);
+/* getuser is deprecated, use CtdlGetUser instead */
+int getuser (struct ctdluser *, char *) __attribute__ ((deprecated));
+/* lgetuser is deprecated, use CtdlGetUserLock instead */
+int lgetuser (struct ctdluser *, char *) __attribute__ ((deprecated));
+/* putuser is deprecated, use CtdlPutUser instead */
+void putuser (struct ctdluser *) __attribute__ ((deprecated));
+/* lputuser is deprecated, use CtdlPutUserLock instead */
+void lputuser (struct ctdluser *) __attribute__ ((deprecated));
 int is_aide (void);
 int is_room_aide (void);
-int getuserbynumber (struct usersupp *usbuf, long int number);
+/* getuserbynumber is deprecated, use CtdlGetUserByNumber instead */
+int getuserbynumber (struct ctdluser *usbuf, long int number) __attribute__ ((deprecated));
+void rebuild_usersbynumber(void);
 void cmd_user (char *cmdbuf);
 void session_startup (void);
-void logout (struct CitContext *who);
-void cmd_pass (char *buf);
+void logged_in_response(void);
+void logout (void);
 int purge_user (char *pname);
-int create_user (char *newusername);
-void cmd_newu (char *cmdbuf);
-void cmd_setp (char *new_pw);
-void cmd_getu (void);
-void cmd_setu (char *new_parms);
-void cmd_slrp (char *new_ptr);
-void cmd_invt_kick (char *iuser, int op);
-void cmd_forg (void);
-void cmd_gnur (void);
-void cmd_vali (char *v_args);
-void ForEachUser(void (*CallBack)(struct usersupp *EachUser, void *out_data),
+int create_user (char *newusername, int become_user);
+void do_login(void);
+int CtdlInvtKick(char *iuser, int op);
+void ForEachUser(void (*CallBack)(struct ctdluser *EachUser, void *out_data),
        void *in_data);
-void ListThisUser(struct usersupp *usbuf, void *data);
-void cmd_list (void);
-void cmd_chek (void);
-void cmd_qusr (char *who);
-void cmd_agup (char *cmdbuf);
-void cmd_asup (char *cmdbuf);
+void ListThisUser(struct ctdluser *usbuf, void *data);
 int NewMailCount(void);
+int InitialMailCheck(void);
 void put_visit(struct visit *newvisit);
 void CtdlGetRelationship(struct visit *vbuf,
-                        struct usersupp *rel_user,
-                        struct quickroom *rel_room);
+                        struct ctdluser *rel_user,
+                        struct ctdlroom *rel_room);
 void CtdlSetRelationship(struct visit *newvisit,
-                        struct usersupp *rel_user,
-                        struct quickroom *rel_room);
-void MailboxName(char *buf, struct usersupp *who, char *prefix);
+                        struct ctdluser *rel_user,
+                        struct ctdlroom *rel_room);
+void MailboxName(char *buf, size_t n, const struct ctdluser *who,
+                const char *prefix);
 int GenerateRelationshipIndex(  char *IndexBuf,
                                 long RoomID,
                                 long RoomGen,
                                 long UserID);
-
-int CtdlLoginExistingUser(char *username);
+int CtdlAssociateSystemUser(char *screenname, char *loginname);
+int CtdlLoginExistingUser(char *authname, char *username);
 
 /*
  * Values which may be returned by CtdlLoginExistingUser()
@@ -61,6 +57,7 @@ enum {
 
 
 int CtdlTryPassword(char *password);
+void CtdlSetPassword(char *new_pw);
 
 /*
  * Values which may be returned by CtdlTryPassword()
@@ -73,5 +70,18 @@ enum {
 };
 
 
+int CtdlForgetThisRoom(void);
+
+void cmd_newu (char *cmdbuf);
+void BumpNewMailCounter(long);
+void start_chkpwd_daemon(void);
+
 
+#define RENAMEUSER_OK                  0       /* Operation succeeded */
+#define RENAMEUSER_LOGGED_IN           1       /* Cannot rename a user who is currently logged in */
+#define RENAMEUSER_NOT_FOUND           2       /* The old user name does not exist */
+#define RENAMEUSER_ALREADY_EXISTS      3       /* An account with the desired new name already exists */
 
+int rename_user(char *oldname, char *newname);
+INLINE void makeuserkey(char *key, char *username);
+int internal_create_user (char *username, struct ctdluser *usbuf, uid_t uid);