NetBSD/src uRCwGNhexternal/bsd/openpam/dist config.sub, external/bsd/openpam/dist/bin/pamtest pamtest.1

   resolve conflicts
VersionDeltaFile
1.4+13-12external/bsd/openpam/dist/lib/libpam/pam_getenv.c
1.7+5-5external/bsd/openpam/dist/include/security/openpam_version.h
1.8+3-3external/bsd/openpam/dist/doc/man/pam_getenv.3
1.10+3-3external/bsd/openpam/dist/doc/man/pam.conf.5
1.3+2-4external/bsd/openpam/dist/config.sub
1.9+3-3external/bsd/openpam/dist/bin/su/su.1
1.9+3-3external/bsd/openpam/dist/bin/pamtest/pamtest.1
1.9+3-3external/bsd/openpam/dist/doc/man/pam_conv.3
1.7+2-2external/bsd/openpam/dist/doc/man/openpam_readlinev.3
1.7+2-2external/bsd/openpam/dist/doc/man/openpam_readword.3
1.8+2-2external/bsd/openpam/dist/doc/man/openpam_set_option.3
1.7+2-2external/bsd/openpam/dist/doc/man/openpam_straddch.3
1.9+2-2external/bsd/openpam/dist/doc/man/openpam_subst.3
1.8+2-2external/bsd/openpam/dist/doc/man/openpam_ttyconv.3
1.11+2-2external/bsd/openpam/dist/doc/man/pam.3
1.8+2-2external/bsd/openpam/dist/doc/man/pam_acct_mgmt.3
1.8+2-2external/bsd/openpam/dist/doc/man/pam_authenticate.3
1.8+2-2external/bsd/openpam/dist/doc/man/pam_close_session.3
1.8+2-2external/bsd/openpam/dist/doc/man/pam_end.3
1.8+2-2external/bsd/openpam/dist/doc/man/pam_error.3
1.9+2-2external/bsd/openpam/dist/doc/man/pam_get_authtok.3
1.8+2-2external/bsd/openpam/dist/doc/man/pam_get_item.3
1.9+2-2external/bsd/openpam/dist/doc/man/pam_get_user.3
1.8+2-2external/bsd/openpam/dist/doc/man/pam_open_session.3
1.8+2-2external/bsd/openpam/dist/doc/man/pam_putenv.3
1.8+2-2external/bsd/openpam/dist/doc/man/pam_set_data.3
1.8+2-2external/bsd/openpam/dist/doc/man/pam_set_item.3
1.8+2-2external/bsd/openpam/dist/doc/man/pam_setcred.3
1.8+2-2external/bsd/openpam/dist/doc/man/pam_sm_acct_mgmt.3
1.8+2-2external/bsd/openpam/dist/doc/man/pam_sm_chauthtok.3
1.8+2-2external/bsd/openpam/dist/doc/man/pam_sm_close_session.3
1.8+2-2external/bsd/openpam/dist/doc/man/pam_sm_open_session.3
1.8+2-2external/bsd/openpam/dist/doc/man/pam_sm_setcred.3
1.9+2-2external/bsd/openpam/dist/doc/man/pam_strerror.3
1.8+2-2external/bsd/openpam/dist/doc/man/pam_vinfo.3
1.8+2-2external/bsd/openpam/dist/doc/man/openpam_nullconv.3
1.8+2-2external/bsd/openpam/dist/doc/man/openpam_readline.3
1.8+2-2external/bsd/openpam/dist/doc/man/openpam_restore_cred.3
1.7+2-2external/bsd/openpam/dist/doc/man/openpam_set_feature.3
1.8+2-2external/bsd/openpam/dist/doc/man/pam_chauthtok.3
1.8+2-2external/bsd/openpam/dist/doc/man/pam_get_data.3
1.8+2-2external/bsd/openpam/dist/doc/man/pam_getenvlist.3
1.8+2-2external/bsd/openpam/dist/doc/man/pam_info.3
1.8+2-2external/bsd/openpam/dist/doc/man/pam_prompt.3
1.8+2-2external/bsd/openpam/dist/doc/man/pam_setenv.3
1.8+2-2external/bsd/openpam/dist/doc/man/pam_start.3
1.8+2-2external/bsd/openpam/dist/doc/man/pam_verror.3
1.8+2-2external/bsd/openpam/dist/doc/man/pam_vprompt.3
1.8+2-2external/bsd/openpam/dist/doc/man/pam_sm_authenticate.3
1.11+2-2external/bsd/openpam/dist/doc/man/openpam.3
1.8+2-2external/bsd/openpam/dist/doc/man/openpam_borrow_cred.3
1.8+2-2external/bsd/openpam/dist/doc/man/openpam_free_data.3
1.9+2-2external/bsd/openpam/dist/doc/man/openpam_free_envlist.3
1.7+2-2external/bsd/openpam/dist/doc/man/openpam_get_feature.3
1.8+2-2external/bsd/openpam/dist/doc/man/openpam_get_option.3
1.8+2-2external/bsd/openpam/dist/doc/man/openpam_log.3
+131-13256 files

UnifiedSplitRaw