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 3300596fca9d8f7caf04e48fd0b587f95b594be8..1d1ac91a0f591525bf4837d50768585819ff9cc8 100644 (file)
--- 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 5057ade2a9a4088bb32cae79c31bc334f7deb09f..c0cf9f9ebd31cd4425c2281922ee41194d8a6e77 100644 (file)
--- 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);