X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fuser_ops.h;h=f58ec1bb6489cfbdfa5c1dfefc2598d58742ee1e;hb=9ffea7c3315046ddcea2589656c13da5f5e0c076;hp=8c72de018f9e27956511270f6ea8f51dde829ade;hpb=d3439d1bc968e5b5c99a4845a563ab8df8678bce;p=citadel.git

diff --git a/citadel/user_ops.h b/citadel/user_ops.h
index 8c72de018..f58ec1bb6 100644
--- a/citadel/user_ops.h
+++ b/citadel/user_ops.h
@@ -1,3 +1,17 @@
+/* 
+ * Header file for server functions which perform operations on user objects.
+ *
+ * Copyright (c) 1987-2019 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__
 
@@ -5,29 +19,25 @@
 #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);
 int CtdlCheckInternetMailPermission(struct ctdluser *who);
-/* getuserbynumber is deprecated, use CtdlGetUserByNumber instead */
-int getuserbynumber (struct ctdluser *usbuf, long int number) __attribute__ ((deprecated));
 void rebuild_usersbynumber(void);
 void session_startup (void);
 void logged_in_response(void);
 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);
@@ -58,44 +68,8 @@ void start_chkpwd_daemon(void);
 
 int rename_user(char *oldname, char *newname);
 
-///#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)
-	{
-		syslog(LOG_INFO, "Username too long: %s", username);
-		cit_backtrace ();
-		len = USERNAME_SIZE - 1; 
-		username[len]='\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)
-	{
-		syslog(LOG_INFO, "Username too 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);
+long cutusername(char *username);
+void makeuserkey(char *key, const char *username, long len);
+int internal_create_user(char *username, struct ctdluser *usbuf, uid_t uid);
 
 #endif