diff options
| author | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2009-08-19 21:58:06 +0800 |
|---|---|---|
| committer | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2009-08-19 21:58:06 +0800 |
| commit | d7300f5b68cb99d92d420d20fbfe079c5310ef46 (patch) | |
| tree | 843986e4aa511e486b14fe7e03ebacfc9e0e27c8 | |
| parent | 07a3f1656ee0471d07138865feace636163d422a (diff) | |
| download | pttbbs-d7300f5b68cb99d92d420d20fbfe079c5310ef46.tar pttbbs-d7300f5b68cb99d92d420d20fbfe079c5310ef46.tar.gz pttbbs-d7300f5b68cb99d92d420d20fbfe079c5310ef46.tar.bz2 pttbbs-d7300f5b68cb99d92d420d20fbfe079c5310ef46.tar.lz pttbbs-d7300f5b68cb99d92d420d20fbfe079c5310ef46.tar.xz pttbbs-d7300f5b68cb99d92d420d20fbfe079c5310ef46.tar.zst pttbbs-d7300f5b68cb99d92d420d20fbfe079c5310ef46.zip | |
* 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
| -rw-r--r-- | mbbsd/Makefile | 4 | ||||
| -rw-r--r-- | mbbsd/emaildb.c | 4 | ||||
| -rw-r--r-- | mbbsd/register.c | 2 |
3 files changed, 5 insertions, 5 deletions
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 |