fixed problems with the pam, nss and kerberos merge code