Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

[citadel.git] / citadel / user_ops.h

diff --git a/citadel/user_ops.h b/citadel/user_ops.h
index bbddd4e885b731f3eaf0bfe6944218f5f22250a8..8c72de018f9e27956511270f6ea8f51dde829ade 100644 (file)
--- a/citadel/user_ops.h
+++ b/citadel/user_ops.h
@@ -3,6 +3,7 @@
 
 #include <ctype.h>
 #include <syslog.h>
+
 int hash (char *str);
 /* getuser is deprecated, use CtdlGetUser instead */
 int getuser (struct ctdluser *, char *) __attribute__ ((deprecated));
@@ -14,14 +15,12 @@ void putuser (struct ctdluser *) __attribute__ ((deprecated));
 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 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);
@@ -69,10 +68,10 @@ static INLINE long cutuserkey(char *username) {
        len = strlen(username);
        if (len >= USERNAME_SIZE)
        {
-               syslog(LOG_EMERG, "Username to long: %s", username);
+               syslog(LOG_INFO, "Username too long: %s", username);
                cit_backtrace ();
                len = USERNAME_SIZE - 1; 
-               ((char*)username)[USERNAME_SIZE - 1]='\0';
+               username[len]='\0';
        }
        return len;
 }
@@ -87,7 +86,7 @@ static INLINE void makeuserkey(char *key, const char *username, long len) {
 
        if (len >= USERNAME_SIZE)
        {
-               syslog(LOG_EMERG, "Username to long: %s", username);
+               syslog(LOG_INFO, "Username too long: %s", username);
                cit_backtrace ();
                len = USERNAME_SIZE - 1; 
        }