removed some debugs

[citadel.git] / citadel / user_ops.h

diff --git a/citadel/user_ops.h b/citadel/user_ops.h
index 1dcc07974a985f10bdc91473385e88b81a844ef8..1a1ba66bc2e28952c3a0a3d0e37e60ad9375cb45 100644 (file)
--- a/citadel/user_ops.h
+++ b/citadel/user_ops.h
@@ -1,49 +1,47 @@
+// Header file for server functions which perform operations on user objects.
+//
+// Copyright (c) 1987-2022 by the citadel.org team
+//
+// This program is open source software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License, version 3.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
 #ifndef __USER_OPS_H__
 #define __USER_OPS_H__
 
 #include <ctype.h>
-/* $Id$ */
+#include <syslog.h>
+
 int hash (char *str);
-/* 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);
-/* getuserbynumber is deprecated, use CtdlGetUserByNumber instead */
-int getuserbynumber (struct ctdluser *usbuf, long int number) __attribute__ ((deprecated));
+int CtdlCheckInternetMailPermission(struct ctdluser *who);
 void rebuild_usersbynumber(void);
-void cmd_user (char *cmdbuf);
 void session_startup (void);
 void logged_in_response(void);
-/* logout() is deprecated use CtdlUserLogout() instead */
-void logout (void) __attribute__ ((deprecated));
 int purge_user (char *pname);
-int create_user (const char *newusername, long len, int become_user);
+int getuserbyuid(struct ctdluser *usbuf, uid_t number);
+
+int create_user(char *newusername, int become_user, uid_t uid);
+enum {
+       CREATE_USER_DO_NOT_BECOME_USER,
+       CREATE_USER_BECOME_USER
+};
+#define NATIVE_AUTH_UID (-1)
+
 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 ctdluser *usbuf, void *data);
+void ForEachUser(void (*CallBack) (char *, void *out_data), void *in_data);
 int NewMailCount(void);
 int InitialMailCheck(void);
 void put_visit(visit *newvisit);
-/* MailboxName is deprecated us CtdlMailboxName instead */
-void MailboxName(char *buf, size_t n, const struct ctdluser *who,
-                const char *prefix) __attribute__ ((deprecated));
-int GenerateRelationshipIndex(  char *IndexBuf,
-                                long RoomID,
-                                long RoomGen,
-                                long UserID);
+int GenerateRelationshipIndex(char *IndexBuf, long RoomID, long RoomGen, long UserID);
 int CtdlAssociateSystemUser(char *screenname, char *loginname);
 
-
-
-
 void CtdlSetPassword(char *new_pw);
 
 int CtdlForgetThisRoom(void);
@@ -52,51 +50,16 @@ void cmd_newu (char *cmdbuf);
 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 */
+#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);
+void reindex_user_928(char *username, void *out_data);
 
-///#ifndef CTDL_INLINE_USR
-////#define CTDL_INLINE_USR static INLINE
-///#endif
-
-///CTDL_INLINE_USR 
-static INLINE long cutuserkey(char *username) { 
-       long len;
-       len = strlen(username);
-       if (len >= USERNAME_SIZE)
-       {
-               CtdlLogPrintf (CTDL_EMERG, "Username to long: %s", username);
-               cit_backtrace ();
-               len = USERNAME_SIZE - 1; 
-               ((char*)username)[USERNAME_SIZE - 1]='\0';
-       }
-       return len;
-}
-
-/*
- * makeuserkey() - convert a username into the format used as a database key
- *              (it's just the username converted into lower case)
- */
-///CTDL_INLINE_USR 
-static INLINE void makeuserkey(char *key, const char *username, long len) {
-       int i;
-
-       if (len >= USERNAME_SIZE)
-       {
-               CtdlLogPrintf (CTDL_EMERG, "Username to long: %s", username);
-               cit_backtrace ();
-               len = USERNAME_SIZE - 1; 
-       }
-       for (i=0; i<=len; ++i) {
-               key[i] = tolower(username[i]);
-       }
-}
-
-
-int internal_create_user (const char *username, long len, struct ctdluser *usbuf, uid_t uid);
+void makeuserkey(char *key, const char *username);
+int CtdlUserCmp(char *s1, char *s2);
+int internal_create_user(char *username, struct ctdluser *usbuf, uid_t uid);
 
 #endif