A little more work on the LDAP Sync

[citadel.git] / citadel / user_ops.h

diff --git a/citadel/user_ops.h b/citadel/user_ops.h
index b057947c6d0a72828e991e465877341b304ed0ed..44cf771e6337cf4efc05cb98335b8b0d9c590221 100644 (file)
--- a/citadel/user_ops.h
+++ b/citadel/user_ops.h
@@ -3,29 +3,27 @@
 
 #include <ctype.h>
 #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);
 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 ForEachUser(void (*CallBack)(struct ctdluser *EachUser, void *out_data), void *in_data);
 void ListThisUser(struct ctdluser *usbuf, void *data);
 int NewMailCount(void);
 int InitialMailCheck(void);
@@ -67,10 +65,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;
 }
@@ -85,7 +83,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; 
        }
@@ -95,6 +93,6 @@ static INLINE void makeuserkey(char *key, const char *username, long len) {
 }
 
 
-int internal_create_user (const char *username, long len, struct ctdluser *usbuf, uid_t uid);
+int internal_create_user(char *username, struct ctdluser *usbuf, uid_t uid);
 
 #endif