X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fuser_ops.h;h=7bd7c6b7f2cc21d7db7048ff0cc12154c0caafc6;hb=e26a8dee20d1726b4995821f717f867f50fc5659;hp=41899ad91dcf0cc75b80737592d371cf3776870a;hpb=0a73d05f8a5fc4d37c2c7ae9b16daba304e37c6e;p=citadel.git

diff --git a/citadel/user_ops.h b/citadel/user_ops.h
index 41899ad91..7bd7c6b7f 100644
--- a/citadel/user_ops.h
+++ b/citadel/user_ops.h
@@ -2,7 +2,7 @@
 #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));
@@ -20,8 +20,6 @@ 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);
 void do_login(void);
@@ -31,7 +29,7 @@ void ForEachUser(void (*CallBack)(struct ctdluser *EachUser, void *out_data),
 void ListThisUser(struct ctdluser *usbuf, void *data);
 int NewMailCount(void);
 int InitialMailCheck(void);
-void put_visit(struct visit *newvisit);
+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));
@@ -69,10 +67,10 @@ static INLINE long cutuserkey(char *username) {
 	len = strlen(username);
 	if (len >= USERNAME_SIZE)
 	{
-		CtdlLogPrintf (CTDL_EMERG, "Username to long: %s", username);
+		syslog(LOG_EMERG, "Username to long: %s", username);
 		cit_backtrace ();
 		len = USERNAME_SIZE - 1; 
-		((char*)username)[USERNAME_SIZE - 1]='\0';
+		username[63]='\0';
 	}
 	return len;
 }
@@ -87,7 +85,7 @@ static INLINE void makeuserkey(char *key, const char *username, long len) {
 
 	if (len >= USERNAME_SIZE)
 	{
-		CtdlLogPrintf (CTDL_EMERG, "Username to long: %s", username);
+		syslog(LOG_EMERG, "Username to long: %s", username);
 		cit_backtrace ();
 		len = USERNAME_SIZE - 1; 
 	}