From 2230c0a8c5a4eb2397673d37e709454195c5e284 Mon Sep 17 00:00:00 2001
From: piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Fri, 28 Aug 2009 13:57:40 +0000
Subject: * moving into the new pwcu (password - current user helper) API
git-svn-id: http://opensvn.csie.org/pttbbs/branches/pttbbs.pwcu@4783 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
mbbsd/admin.c | 1 +
1 file changed, 1 insertion(+)
(limited to 'mbbsd/admin.c')
diff --git a/mbbsd/admin.c b/mbbsd/admin.c
index cab1089f..b1f6f1c7 100644
--- a/mbbsd/admin.c
+++ b/mbbsd/admin.c
@@ -103,6 +103,7 @@ upgrade_passwd(userec_t *puser)
memset(puser->chkpad0, 0, sizeof(puser->chkpad0));
memset(puser->chkpad1, 0, sizeof(puser->chkpad1));
memset(puser->chkpad2, 0, sizeof(puser->chkpad2));
+ puser->numlogindays = 0;
puser->version = PASSWD_VERSION;
return;
}
--
cgit v1.2.3
From 3a5906defc274d40f0e58eec77048cdeb8ad64fa Mon Sep 17 00:00:00 2001
From: piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Sat, 29 Aug 2009 14:23:20 +0000
Subject: * (pwcu branch) end support of r2275 version password
git-svn-id: http://opensvn.csie.org/pttbbs/branches/pttbbs.pwcu@4790 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
mbbsd/admin.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
(limited to 'mbbsd/admin.c')
diff --git a/mbbsd/admin.c b/mbbsd/admin.c
index b1f6f1c7..48ebba94 100644
--- a/mbbsd/admin.c
+++ b/mbbsd/admin.c
@@ -89,13 +89,18 @@ static int retrieve_backup(userec_t *user)
return -1;
}
-void
+int
upgrade_passwd(userec_t *puser)
{
if (puser->version == PASSWD_VERSION)
- return;
+ return 1;
if (!puser->userid[0])
- return;
+ return 1;
+ // unknown version
+ return 0;
+
+#if 0
+ // this is a sample.
if (puser->version == 2275) // chicken change
{
memset(puser->career, 0, sizeof(puser->career));
@@ -104,9 +109,11 @@ upgrade_passwd(userec_t *puser)
memset(puser->chkpad1, 0, sizeof(puser->chkpad1));
memset(puser->chkpad2, 0, sizeof(puser->chkpad2));
puser->numlogindays = 0;
+ puser->lastseen = 0;
puser->version = PASSWD_VERSION;
- return;
+ return ;
}
+#endif
}
static int
@@ -160,7 +167,8 @@ search_key_user(const char *passwdfile, int mode)
}
// XXX �o�̷|���¸�ơA�n�p�� PWD �� upgrade
- upgrade_passwd(&user);
+ if (!upgrade_passwd(&user))
+ continue;
keymatch = NULL;
--
cgit v1.2.3
From 2962ffe9d364a629996465a1cf08770791823db3 Mon Sep 17 00:00:00 2001
From: piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Sun, 30 Aug 2009 03:00:49 +0000
Subject: * (pwcu branch) make user compatible to pwcu API
git-svn-id: http://opensvn.csie.org/pttbbs/branches/pttbbs.pwcu@4794 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
mbbsd/admin.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
(limited to 'mbbsd/admin.c')
diff --git a/mbbsd/admin.c b/mbbsd/admin.c
index 48ebba94..0ed06412 100644
--- a/mbbsd/admin.c
+++ b/mbbsd/admin.c
@@ -43,7 +43,7 @@ m_user(void)
if ((id = getuser(genbuf, &xuser))) {
user_display(&xuser, 1);
if( HasUserPerm(PERM_ACCOUNTS) )
- uinfo_query(&xuser, 1, id);
+ uinfo_query(xuser.userid, 1, id);
else
pressanykey();
} else {
@@ -217,10 +217,13 @@ search_key_user(const char *passwdfile, int mode)
// user_display does not have linefeed in tail.
if (isCurrentPwd && HasUserPerm(PERM_ACCOUNTS))
- uinfo_query(&user, 1, unum);
+ uinfo_query(user.userid, 1, unum);
else
outs("\n");
+ // XXX don't trust 'user' variable after here
+ // because uinfo_query may have changed it.
+
outs(ANSI_COLOR(44) " �ť���" \
ANSI_COLOR(37) ":�j�M�U�@�� " \
ANSI_COLOR(33)" Q" ANSI_COLOR(37)": ���}");
--
cgit v1.2.3
From 5f589c904a3be5b6eaa5abd57052b481d6a24c18 Mon Sep 17 00:00:00 2001
From: piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Sun, 30 Aug 2009 10:08:49 +0000
Subject: * fix numlogindays
git-svn-id: http://opensvn.csie.org/pttbbs/branches/pttbbs.pwcu@4799 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
mbbsd/admin.c | 1 -
1 file changed, 1 deletion(-)
(limited to 'mbbsd/admin.c')
diff --git a/mbbsd/admin.c b/mbbsd/admin.c
index 0ed06412..9dcc5b8a 100644
--- a/mbbsd/admin.c
+++ b/mbbsd/admin.c
@@ -108,7 +108,6 @@ upgrade_passwd(userec_t *puser)
memset(puser->chkpad0, 0, sizeof(puser->chkpad0));
memset(puser->chkpad1, 0, sizeof(puser->chkpad1));
memset(puser->chkpad2, 0, sizeof(puser->chkpad2));
- puser->numlogindays = 0;
puser->lastseen = 0;
puser->version = PASSWD_VERSION;
return ;
--
cgit v1.2.3
From 3fbfbac63d50619f92d98140fa7f59f570a180c7 Mon Sep 17 00:00:00 2001
From: piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Mon, 31 Aug 2009 05:54:49 +0000
Subject: * merge pwcu branch with trunk
git-svn-id: http://opensvn.csie.org/pttbbs/branches/pttbbs.pwcu@4806 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
mbbsd/admin.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'mbbsd/admin.c')
diff --git a/mbbsd/admin.c b/mbbsd/admin.c
index 9dcc5b8a..011f81e7 100644
--- a/mbbsd/admin.c
+++ b/mbbsd/admin.c
@@ -108,7 +108,7 @@ upgrade_passwd(userec_t *puser)
memset(puser->chkpad0, 0, sizeof(puser->chkpad0));
memset(puser->chkpad1, 0, sizeof(puser->chkpad1));
memset(puser->chkpad2, 0, sizeof(puser->chkpad2));
- puser->lastseen = 0;
+ puser->lastseen= 0;
puser->version = PASSWD_VERSION;
return ;
}
--
cgit v1.2.3