nbpwd_mkdb dumps core on 5.99.7

[Shin'ichiro TAYA <taya%ba2.so-net.ne.jp@localhost>]

I successfully built 5.99.7 on 5.99.6 and running fine now.
Then I tried to build whole tree again on 5.99.7.
But nbpwd_mkdb dumps core.
I think tools/compat/compat_pwd.h should be updated like this:

diff -u -r1.5 compat_pwd.h
--- compat_pwd.h        28 Apr 2008 20:24:12 -0000      1.5
+++ compat_pwd.h        17 Jan 2009 14:13:27 -0000
@@ -50,12 +50,12 @@
        char    *pw_passwd;
        int32_t pw_uid;
        int32_t pw_gid;
-       int32_t pw_change;
+       int64_t pw_change;
        char    *pw_class;
        char    *pw_gecos;
        char    *pw_dir;
        char    *pw_shell;
-       int32_t pw_expire;
+       int64_t pw_expire;
 };

 int pw_scan(char *, struct passwd *, int *);