The "c_smtpclient_use_starttls" configuration option has been replaced

[citadel.git] / citadel / user_ops.h

diff --git a/citadel/user_ops.h b/citadel/user_ops.h
index 8dace4ad6b6a351f76605e75b89d29efab2f1b9c..697554f13ffa61e1fcaa025965ffdd8b0d64dd3e 100644 (file)
--- a/citadel/user_ops.h
+++ b/citadel/user_ops.h
@@ -12,17 +12,18 @@ void rebuild_usersbynumber(void);
 void session_startup (void);
 void logged_in_response(void);
 int purge_user (char *pname);
+int getuserbyuid(struct ctdluser *usbuf, uid_t number);
 
-int create_user (const char *newusername, int become_user);
+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);
@@ -65,7 +66,6 @@ static INLINE long cutuserkey(char *username) {
        if (len >= USERNAME_SIZE)
        {
                syslog(LOG_INFO, "Username too long: %s", username);
-               cit_backtrace ();
                len = USERNAME_SIZE - 1; 
                username[len]='\0';
        }
@@ -83,7 +83,6 @@ static INLINE void makeuserkey(char *key, const char *username, long len) {
        if (len >= USERNAME_SIZE)
        {
                syslog(LOG_INFO, "Username too long: %s", username);
-               cit_backtrace ();
                len = USERNAME_SIZE - 1; 
        }
        for (i=0; i<=len; ++i) {