this makes them consistent, since we only use base-* and not the system-* style. it also adds keyring support to pam