From d7300f5b68cb99d92d420d20fbfe079c5310ef46 Mon Sep 17 00:00:00 2001
From: piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Wed, 19 Aug 2009 13:58:06 +0000
Subject:  * WITH_EMAILDB was deprecated by USE_EMAILDB in pttbbs.conf.  *
 ambiguous user id check is toggled by WITH_REGCHECKD

git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@4756 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 mbbsd/Makefile   | 4 ----
 mbbsd/emaildb.c  | 4 ++++
 mbbsd/register.c | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'mbbsd')

diff --git a/mbbsd/Makefile b/mbbsd/Makefile
index 7be123e0..723e0d39 100644
--- a/mbbsd/Makefile
+++ b/mbbsd/Makefile
@@ -36,10 +36,6 @@ LDLIBS:= ${LDLIBS} ${:!mysql_config --libs!}
 CFLAGS+= -DLOG_CRAWLER 
 .endif
 
-.if !defined(WITHOUT_EMAILDB)	&& defined(WITH_EMAILDB)
-CFLAGS+= -DUSE_EMAILDB -DUSE_REGCHECKD
-.endif
-
 .if !defined(WITHOUT_BBSLUA_USAGE) && defined(WITH_BBSLUA_USAGE)
 CFLAGS+= -DBBSLUA_USAGE
 .endif
diff --git a/mbbsd/emaildb.c b/mbbsd/emaildb.c
index 282b2727..d8718b1b 100644
--- a/mbbsd/emaildb.c
+++ b/mbbsd/emaildb.c
@@ -71,6 +71,10 @@ int emaildb_update_email(char * userid, int userid_len, char * email, int email_
     return result;
 }
 
+#endif
+
+#ifdef USE_REGCHECKD
+
 // XXX move to regcheck someday
 int regcheck_ambiguous_userid_exist(const char *userid)
 {
diff --git a/mbbsd/register.c b/mbbsd/register.c
index 2f4bffcc..ea9f546a 100644
--- a/mbbsd/register.c
+++ b/mbbsd/register.c
@@ -706,7 +706,7 @@ new_register(void)
 	else if (reserved_user_id(passbuf))
 	    outs("此代號已由系統保留，請使用別的代號\n");
 #if !defined(NO_CHECK_AMBIGUOUS_USERID) && defined(USE_REGCHECKD)
-	else if (check_ambiguous_userid_exist(passbuf) > 0) // ignore if error occurs
+	else if (regcheck_ambiguous_userid_exist(passbuf) > 0) // ignore if error occurs
 	    outs("此代號過於近似它人帳號，請改用別的代號。\n");
 #endif
 	else // success
-- 
cgit v1.2.3