fix race condition of user registeration (as well as while restoring a

backed-up account):

   Procoess A               Process B
   ======================   =====================
   uid = searchuser("")
                            uid = searchuser("")
   setuserid(uid, userid)
                            setuserid(uid, userid)



git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@3007 63ad8ddf-47c3-0310-b6dd-a9e9d9715204

1 files changed, 1 insertions, 15 deletions

diff --git a/mbbsd/admin.c b/mbbsd/admin.c
index cb79582c..eb6b47d1 100644
--- a/mbbsd/admin.c
+++ b/mbbsd/admin.c
@@ -141,21 +141,7 @@ search_key_user(const char *passwdfile, int mode)
 			    outs("目前的PASSWDS檔沒有此id "
 				 "請先new一個這個id的帳號");
 			} else {
-			    int             allocid = getnewuserid();
-
-			    if (allocid > MAX_USERS || allocid <= 0) {
-				fprintf(stderr, "本站人口已達飽和！\n");
-				exit(1);
-			    }
-			    if (passwd_update(allocid, &user) == -1) {
-				fprintf(stderr, "客滿了，再見！\n");
-				exit(1);
-			    }
-			    setuserid(allocid, user.userid);
-			    if (!searchuser(user.userid, NULL)) {
-				fprintf(stderr, "無法建立帳號\n");
-				exit(1);
-			    }
+			    setupnewuser(&user);
 			    fclose(fp1);
 			    return 0;
 			}