From: Dave West <davew@uncensored.citadel.org>
Date: Sun, 8 Nov 2009 19:07:25 +0000 (+0000)
Subject: Moved the prototypes of CtdlLoginExistingUser and CtdlTryPassword into
X-Git-Tag: v7.86~649
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=34fd48d16bdc678356d400eb1584fe3bb13d2cee

Moved the prototypes of CtdlLoginExistingUser and CtdlTryPassword into
ctdl_module.h.
They constitute part of the API for modules and we shouldn't need to
include user_ops.h in modules.
---

diff --git a/citadel/include/ctdl_module.h b/citadel/include/ctdl_module.h
index 3300596fc..1d1ac91a0 100644
--- a/citadel/include/ctdl_module.h
+++ b/citadel/include/ctdl_module.h
@@ -297,6 +297,32 @@ void CtdlSetRelationship(struct visit *newvisit,
                         struct ctdlroom *rel_room);
 void CtdlMailboxName(char *buf, size_t n, const struct ctdluser *who, const char *prefix);
 
+int CtdlLoginExistingUser(char *authname, char *username);
+
+/*
+ * Values which may be returned by CtdlLoginExistingUser()
+ */
+enum {
+	pass_ok,
+	pass_already_logged_in,
+	pass_no_user,
+	pass_internal_error,
+	pass_wrong_password
+};
+
+int CtdlTryPassword(char *password);
+/*
+ * Values which may be returned by CtdlTryPassword()
+ */
+enum {
+	login_ok,
+	login_already_logged_in,
+	login_too_many_users,
+	login_not_found
+};
+
+
+
 
 /*
  * Expose API calls from msgbase.c
diff --git a/citadel/user_ops.h b/citadel/user_ops.h
index 5057ade2a..c0cf9f9eb 100644
--- a/citadel/user_ops.h
+++ b/citadel/user_ops.h
@@ -35,36 +35,12 @@ int GenerateRelationshipIndex(  char *IndexBuf,
                                 long RoomGen,
                                 long UserID);
 int CtdlAssociateSystemUser(char *screenname, char *loginname);
-int CtdlLoginExistingUser(char *authname, char *username);
 
-/*
- * Values which may be returned by CtdlLoginExistingUser()
- */
-enum {
-	pass_ok,
-	pass_already_logged_in,
-	pass_no_user,
-	pass_internal_error,
-	pass_wrong_password
-};
 
 
 
-
-int CtdlTryPassword(char *password);
 void CtdlSetPassword(char *new_pw);
 
-/*
- * Values which may be returned by CtdlTryPassword()
- */
-enum {
-	login_ok,
-	login_already_logged_in,
-	login_too_many_users,
-	login_not_found
-};
-
-
 int CtdlForgetThisRoom(void);
 
 void cmd_newu (char *cmdbuf);