From 2a754ed8d38bfe6b64aa74c11eced827ba97be83 Mon Sep 17 00:00:00 2001
From: piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Sat, 23 May 2009 15:43:40 +0000
Subject: refine: reduce the i/o request to check reserved id

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

diff --git a/include/common.h b/include/common.h
index 655c06b9..7ada007b 100644
--- a/include/common.h
+++ b/include/common.h
@@ -33,7 +33,7 @@
 #define FN_TICKET_BRDLIST "boardlist"
 #define FN_BRDLISTHELP	"etc/boardlist.help"
 #define FN_BOARDHELP	"etc/board.help"
-#define FN_RESERVED_ID "etc/reserved.id"   // �O�d�t�ΥεL�k���U�� ID
+#define FN_RESERVED_ID	"etc/reserved.id"   // �O�d�t�ΥεL�k���U�� ID
 #define FN_USERMEMO	"memo.txt"	// �ϥΪ̭ӤH�O�ƥ�
 
 
diff --git a/mbbsd/register.c b/mbbsd/register.c
index b06b8400..427d1b9d 100644
--- a/mbbsd/register.c
+++ b/mbbsd/register.c
@@ -722,8 +722,6 @@ new_register(void)
 
 	if (bad_user_id(passbuf))
 	    outs("�L�k�����o�ӥN���A�Шϥέ^��r���A�åB���n�]�t�Ů�\n");
-	else if (reserved_user_id(passbuf))
-	    outs("���N���w�ѫO�d�A�ШϥΧO���N��\n");
 	else if ((id = getuser(passbuf, &xuser)) &&
 		// >=: see check_and_expire_account definition
 		 (minute = check_and_expire_account(id, &xuser, 0)) >= 0) 
@@ -734,7 +732,10 @@ new_register(void)
 		prints("���N���w�g���H�ϥ� �٦� %d �Ѥ~�L�� \n", 
 			minute / (60 * 24) + 1);
 	    }
-	} else
+	} 
+	else if (reserved_user_id(passbuf))
+	    outs("���N���w�ѫO�d�A�ШϥΧO���N��\n");
+	else // success
 	    break;
     }
 
-- 
cgit v1.2.3