Moved BumpNewMailCounter() into context.c because it manipulates contexts.

[citadel.git] / citadel / user_ops.h

diff --git a/citadel/user_ops.h b/citadel/user_ops.h
index be1d4716d9f71f12553e558b755b5155fad26462..727c98cb33e758daafe50cb3b6d62a3a1fa22b8f 100644 (file)
--- a/citadel/user_ops.h
+++ b/citadel/user_ops.h
@@ -1,89 +1,50 @@
 /* $Id$ */
 int hash (char *str);
-int getuser (struct ctdluser *, char *);
-int lgetuser (struct ctdluser *, char *);
-void putuser (struct ctdluser *);
-void lputuser (struct ctdluser *);
+/* 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 ctdluser *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);
+/* logout() is deprecated use CtdlUserLogout() instead */
+void logout (void) __attribute__ ((deprecated));
 int purge_user (char *pname);
 int create_user (char *newusername, int become_user);
 void do_login(void);
-void cmd_newu (char *cmdbuf);
-void cmd_creu (char *cmdbuf);
-void cmd_setp (char *new_pw);
-void cmd_getu (void);
-void cmd_setu (char *new_parms);
-void cmd_slrp (char *new_ptr);
 int CtdlInvtKick(char *iuser, int op);
-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 ctdluser *EachUser, void *out_data),
        void *in_data);
 void ListThisUser(struct ctdluser *usbuf, void *data);
-void cmd_list (char *);
-void cmd_chek (void);
-void cmd_qusr (char *who);
-void cmd_agup (char *cmdbuf);
-void cmd_asup (char *cmdbuf);
-void cmd_view (char *cmdbuf);
-void cmd_renu (char *cmdbuf);
 int NewMailCount(void);
 int InitialMailCheck(void);
 void put_visit(struct visit *newvisit);
-void CtdlGetRelationship(struct visit *vbuf,
-                        struct ctdluser *rel_user,
-                        struct ctdlroom *rel_room);
-void CtdlSetRelationship(struct visit *newvisit,
-                        struct ctdluser *rel_user,
-                        struct ctdlroom *rel_room);
+/* MailboxName is deprecated us CtdlMailboxName instead */
 void MailboxName(char *buf, size_t n, const struct ctdluser *who,
-                const char *prefix);
+                const char *prefix) __attribute__ ((deprecated));
 int GenerateRelationshipIndex(  char *IndexBuf,
                                 long RoomID,
                                 long RoomGen,
                                 long UserID);
 int CtdlAssociateSystemUser(char *screenname, char *loginname);
-int CtdlLoginExistingUser(char *authname, char *username);
-
-/*
- * Values which may be returned by CtdlLoginExistingUser()
- */
-enum {
-       pass_ok,
-       pass_already_logged_in,
-       pass_no_user,
-       pass_internal_error,
-       pass_wrong_password
-};
-
 
 
 
-int CtdlTryPassword(char *password);
-
-/*
- * Values which may be returned by CtdlTryPassword()
- */
-enum {
-       login_ok,
-       login_already_logged_in,
-       login_too_many_users,
-       login_not_found
-};
 
+void CtdlSetPassword(char *new_pw);
 
 int CtdlForgetThisRoom(void);
-void cmd_seen(char *argbuf);
-void cmd_gtsn(char *argbuf);
-void BumpNewMailCounter(long);
+
+void cmd_newu (char *cmdbuf);
 void start_chkpwd_daemon(void);
 
 
@@ -93,3 +54,5 @@ void start_chkpwd_daemon(void);
 #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);