Fixes for SunOS and pam option.