couldn't log on to my -CURRENT machine after upgrade to latest PAM

I just upgraded my -CURRENT machine for the first time since
mid-November.  When I rebooted, I was surprised that I was unable to log
in via either ssh or directly on the console.  The diagnostics printed
to the console indicated that pam_skey.so was missing.  Since that was
nuked a long time ago, I was puzzled about why it seemed to be required
again.

I was able to get on the machine by booting it single user.  I moved
/etc/pam.conf out of the way and am now able to log in.

Nothing referenced pam_skey under /etc/pam.d, but I found than I had an
ancient copy of /etc/pam.conf that still used pam_skey.  The
documentation says that /etc/pam.conf is only used if
/etc/pam.d/service-name isn't found, and the code appears to agree with
that, however this doesn't seem to be working as expected after the
latest import of PAM.