From 5fa46a04753f5074ab32031e9b1b037c2895621f Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sat, 14 Sep 2013 22:30:41 +0200
Subject: [PATCH] move cmd_isme to serv_user.c

---
 citadel/internet_addressing.c         | 28 ---------------------------
 citadel/modules/ctdlproto/serv_user.c | 20 +++++++++++++++++++
 citadel/scripts/mk_module_init.sh     |  2 +-
 3 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index a1b0a37e1..bc60368e6 100644
--- a/citadel/internet_addressing.c
+++ b/citadel/internet_addressing.c
@@ -355,25 +355,6 @@ int CtdlIsMe(char *addr, int addr_buf_len)
 }
 
 
-/*
- * Citadel protocol command to do the same
- */
-void cmd_isme(char *argbuf) {
-	char addr[256];
-
-	if (CtdlAccessCheck(ac_logged_in)) return;
-	extract_token(addr, argbuf, 0, '|', sizeof addr);
-
-	if (CtdlIsMe(addr, sizeof addr)) {
-		cprintf("%d %s\n", CIT_OK, addr);
-	}
-	else {
-		cprintf("%d Not you.\n", ERROR + ILLEGAL_VALUE);
-	}
-
-}
-
-
 /* If the last item in a list of recipients was truncated to a partial address,
  * remove it completely in order to avoid choking libSieve
  */
@@ -1703,12 +1684,3 @@ char *harvest_collected_addresses(struct CtdlMessage *msg) {
 	}
 	return(coll);
 }
-
-
-CTDL_MODULE_INIT(internet_addressing)
-{
-	if (!threading) {
-		CtdlRegisterProtoHook(cmd_isme, "ISME", "Determine whether an email address belongs to a user");
-	}
-	return "internet_addressing";
-}
diff --git a/citadel/modules/ctdlproto/serv_user.c b/citadel/modules/ctdlproto/serv_user.c
index a632aa43f..caff5efb0 100644
--- a/citadel/modules/ctdlproto/serv_user.c
+++ b/citadel/modules/ctdlproto/serv_user.c
@@ -698,6 +698,25 @@ void cmd_asup(char *cmdbuf)
 }
 
 
+/*
+ * Citadel protocol command to do the same
+ */
+void cmd_isme(char *argbuf) {
+	char addr[256];
+
+	if (CtdlAccessCheck(ac_logged_in)) return;
+	extract_token(addr, argbuf, 0, '|', sizeof addr);
+
+	if (CtdlIsMe(addr, sizeof addr)) {
+		cprintf("%d %s\n", CIT_OK, addr);
+	}
+	else {
+		cprintf("%d Not you.\n", ERROR + ILLEGAL_VALUE);
+	}
+
+}
+
+
 /*
  * Set the preferred view for the current user/room combination
  */
@@ -804,6 +823,7 @@ CTDL_MODULE_INIT(serv_user)
 		CtdlRegisterProtoHook(cmd_view, "VIEW", "Set preferred view for user/room combination");
 		CtdlRegisterProtoHook(cmd_renu, "RENU", "Rename a user");
 		CtdlRegisterProtoHook(cmd_newu, "NEWU", "Log in as a new user");
+		CtdlRegisterProtoHook(cmd_isme, "ISME", "Determine whether an email address belongs to a user");
 	}
 	/* return our Subversion id for the Log */
 	return "user";
diff --git a/citadel/scripts/mk_module_init.sh b/citadel/scripts/mk_module_init.sh
index e0642bb13..9bf2003af 100755
--- a/citadel/scripts/mk_module_init.sh
+++ b/citadel/scripts/mk_module_init.sh
@@ -30,7 +30,7 @@ U_FILE="$CUR_DIR/modules_upgrade.c"
 
 /usr/bin/printf "Scanning extension modules for entry points.\n"
 
-STATIC_FIRST_MODULES="control modules euidindex msgbase nttlist database internet_addressing"
+STATIC_FIRST_MODULES="control modules euidindex msgbase nttlist database"
 DYNAMIC_MODULES=`grep CTDL_MODULE_INIT modules/*/*.c |$SED 's;.*(\(.*\));\1;'`
 if test -d user_modules; then 
     USER_MODULES=`grep CTDL_MODULE_INIT user_modules/*/*.c |$SED 's;.*(\(.*\));\1;'`
-- 
2.30.2