Module Name: src
Committed By: christos
Date: Sat May 6 19:50:10 UTC 2017
Modified Files:
src/external/bsd/openpam/dist/bin/pamtest: pamtest.1 pamtest.c
src/external/bsd/openpam/dist/bin/su: su.1 su.c
src/external/bsd/openpam/dist/doc/man: openpam.3 openpam_borrow_cred.3
openpam_free_data.3 openpam_free_envlist.3 openpam_get_feature.3
openpam_get_option.3 openpam_log.3 openpam_nullconv.3
openpam_readline.3 openpam_readlinev.3 openpam_readword.3
openpam_restore_cred.3 openpam_set_feature.3 openpam_set_option.3
openpam_straddch.3 openpam_subst.3 openpam_ttyconv.3 pam.3
pam.conf.5 pam_acct_mgmt.3 pam_authenticate.3 pam_chauthtok.3
pam_close_session.3 pam_conv.3 pam_end.3 pam_error.3
pam_get_authtok.3 pam_get_data.3 pam_get_item.3 pam_get_user.3
pam_getenv.3 pam_getenvlist.3 pam_info.3 pam_open_session.3
pam_prompt.3 pam_putenv.3 pam_set_data.3 pam_set_item.3
pam_setcred.3 pam_setenv.3 pam_sm_acct_mgmt.3 pam_sm_authenticate.3
pam_sm_chauthtok.3 pam_sm_close_session.3 pam_sm_open_session.3
pam_sm_setcred.3 pam_start.3 pam_strerror.3 pam_verror.3
pam_vinfo.3 pam_vprompt.3
src/external/bsd/openpam/dist/include/security: openpam.h
openpam_attr.h openpam_version.h pam_appl.h pam_constants.h
pam_modules.h pam_types.h
src/external/bsd/openpam/dist/lib/libpam: openpam_asprintf.c
openpam_asprintf.h openpam_borrow_cred.c
openpam_check_owner_perms.c openpam_configure.c openpam_constants.c
openpam_constants.h openpam_cred.h openpam_ctype.h openpam_debug.h
openpam_dispatch.c openpam_dlfunc.h openpam_dynamic.c
openpam_features.c openpam_features.h openpam_findenv.c
openpam_free_data.c openpam_free_envlist.c openpam_get_feature.c
openpam_get_option.c openpam_impl.h openpam_load.c openpam_log.c
openpam_nullconv.c openpam_readline.c openpam_readlinev.c
openpam_readword.c openpam_restore_cred.c openpam_set_feature.c
openpam_set_option.c openpam_static.c openpam_straddch.c
openpam_strlcat.c openpam_strlcat.h openpam_strlcmp.h
openpam_strlcpy.c openpam_strlcpy.h openpam_strlset.c
openpam_strlset.h openpam_subst.c openpam_ttyconv.c
openpam_vasprintf.c openpam_vasprintf.h pam_acct_mgmt.c
pam_authenticate.c pam_authenticate_secondary.c pam_chauthtok.c
pam_close_session.c pam_end.c pam_error.c pam_get_authtok.c
pam_get_data.c pam_get_item.c pam_get_mapped_authtok.c
pam_get_mapped_username.c pam_get_user.c pam_getenv.c
pam_getenvlist.c pam_info.c pam_open_session.c pam_prompt.c
pam_putenv.c pam_set_data.c pam_set_item.c pam_set_mapped_authtok.c
pam_set_mapped_username.c pam_setcred.c pam_setenv.c
pam_sm_acct_mgmt.c pam_sm_authenticate.c
pam_sm_authenticate_secondary.c pam_sm_chauthtok.c
pam_sm_close_session.c pam_sm_get_mapped_authtok.c
pam_sm_get_mapped_username.c pam_sm_open_session.c
pam_sm_set_mapped_authtok.c pam_sm_set_mapped_username.c
pam_sm_setcred.c pam_start.c pam_strerror.c pam_verror.c
pam_vinfo.c pam_vprompt.c
src/external/bsd/openpam/dist/misc: gendoc.pl
src/external/bsd/openpam/dist/modules/pam_deny: pam_deny.c
src/external/bsd/openpam/dist/modules/pam_permit: pam_permit.c
src/external/bsd/openpam/dist/modules/pam_unix: pam_unix.c
src/external/bsd/openpam/dist/t: t_openpam_readlinev.c
t_openpam_readword.c
Removed Files:
src/external/bsd/openpam/dist: pamgdb.in
src/external/bsd/openpam/dist/t: t.h t_file.c t_main.c
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/openpam/dist/pamgdb.in
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/openpam/dist/bin/pamtest/pamtest.1
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/openpam/dist/bin/pamtest/pamtest.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/openpam/dist/bin/su/su.1
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/openpam/dist/bin/su/su.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/openpam/dist/doc/man/openpam.3 \
src/external/bsd/openpam/dist/doc/man/pam.3
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/openpam/dist/doc/man/openpam_borrow_cred.3 \
src/external/bsd/openpam/dist/doc/man/openpam_free_data.3 \
src/external/bsd/openpam/dist/doc/man/openpam_get_option.3 \
src/external/bsd/openpam/dist/doc/man/openpam_log.3 \
src/external/bsd/openpam/dist/doc/man/openpam_nullconv.3 \
src/external/bsd/openpam/dist/doc/man/openpam_readline.3 \
src/external/bsd/openpam/dist/doc/man/openpam_restore_cred.3 \
src/external/bsd/openpam/dist/doc/man/openpam_set_option.3 \
src/external/bsd/openpam/dist/doc/man/openpam_ttyconv.3 \
src/external/bsd/openpam/dist/doc/man/pam_acct_mgmt.3 \
src/external/bsd/openpam/dist/doc/man/pam_authenticate.3 \
src/external/bsd/openpam/dist/doc/man/pam_chauthtok.3 \
src/external/bsd/openpam/dist/doc/man/pam_close_session.3 \
src/external/bsd/openpam/dist/doc/man/pam_end.3 \
src/external/bsd/openpam/dist/doc/man/pam_error.3 \
src/external/bsd/openpam/dist/doc/man/pam_get_data.3 \
src/external/bsd/openpam/dist/doc/man/pam_get_item.3 \
src/external/bsd/openpam/dist/doc/man/pam_getenv.3 \
src/external/bsd/openpam/dist/doc/man/pam_getenvlist.3 \
src/external/bsd/openpam/dist/doc/man/pam_info.3 \
src/external/bsd/openpam/dist/doc/man/pam_open_session.3 \
src/external/bsd/openpam/dist/doc/man/pam_prompt.3 \
src/external/bsd/openpam/dist/doc/man/pam_putenv.3 \
src/external/bsd/openpam/dist/doc/man/pam_set_data.3 \
src/external/bsd/openpam/dist/doc/man/pam_set_item.3 \
src/external/bsd/openpam/dist/doc/man/pam_setcred.3 \
src/external/bsd/openpam/dist/doc/man/pam_setenv.3 \
src/external/bsd/openpam/dist/doc/man/pam_sm_acct_mgmt.3 \
src/external/bsd/openpam/dist/doc/man/pam_sm_authenticate.3 \
src/external/bsd/openpam/dist/doc/man/pam_sm_chauthtok.3 \
src/external/bsd/openpam/dist/doc/man/pam_sm_close_session.3 \
src/external/bsd/openpam/dist/doc/man/pam_sm_open_session.3 \
src/external/bsd/openpam/dist/doc/man/pam_sm_setcred.3 \
src/external/bsd/openpam/dist/doc/man/pam_start.3 \
src/external/bsd/openpam/dist/doc/man/pam_verror.3 \
src/external/bsd/openpam/dist/doc/man/pam_vinfo.3 \
src/external/bsd/openpam/dist/doc/man/pam_vprompt.3
cvs rdiff -u -r1.7 -r1.8 \
src/external/bsd/openpam/dist/doc/man/openpam_free_envlist.3 \
src/external/bsd/openpam/dist/doc/man/openpam_subst.3 \
src/external/bsd/openpam/dist/doc/man/pam_conv.3 \
src/external/bsd/openpam/dist/doc/man/pam_get_authtok.3 \
src/external/bsd/openpam/dist/doc/man/pam_get_user.3 \
src/external/bsd/openpam/dist/doc/man/pam_strerror.3
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/openpam/dist/doc/man/openpam_get_feature.3 \
src/external/bsd/openpam/dist/doc/man/openpam_readlinev.3 \
src/external/bsd/openpam/dist/doc/man/openpam_readword.3 \
src/external/bsd/openpam/dist/doc/man/openpam_set_feature.3 \
src/external/bsd/openpam/dist/doc/man/openpam_straddch.3
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/openpam/dist/doc/man/pam.conf.5
cvs rdiff -u -r1.8 -r1.9 \
src/external/bsd/openpam/dist/include/security/openpam.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/openpam/dist/include/security/openpam_attr.h \
src/external/bsd/openpam/dist/include/security/openpam_version.h \
src/external/bsd/openpam/dist/include/security/pam_appl.h \
src/external/bsd/openpam/dist/include/security/pam_constants.h \
src/external/bsd/openpam/dist/include/security/pam_modules.h \
src/external/bsd/openpam/dist/include/security/pam_types.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/openpam/dist/lib/libpam/openpam_asprintf.c \
src/external/bsd/openpam/dist/lib/libpam/openpam_asprintf.h \
src/external/bsd/openpam/dist/lib/libpam/openpam_borrow_cred.c \
src/external/bsd/openpam/dist/lib/libpam/openpam_check_owner_perms.c \
src/external/bsd/openpam/dist/lib/libpam/openpam_configure.c \
src/external/bsd/openpam/dist/lib/libpam/openpam_constants.c \
src/external/bsd/openpam/dist/lib/libpam/openpam_constants.h \
src/external/bsd/openpam/dist/lib/libpam/openpam_cred.h \
src/external/bsd/openpam/dist/lib/libpam/openpam_ctype.h \
src/external/bsd/openpam/dist/lib/libpam/openpam_debug.h \
src/external/bsd/openpam/dist/lib/libpam/openpam_dispatch.c \
src/external/bsd/openpam/dist/lib/libpam/openpam_dlfunc.h \
src/external/bsd/openpam/dist/lib/libpam/openpam_dynamic.c \
src/external/bsd/openpam/dist/lib/libpam/openpam_features.c \
src/external/bsd/openpam/dist/lib/libpam/openpam_features.h \
src/external/bsd/openpam/dist/lib/libpam/openpam_findenv.c \
src/external/bsd/openpam/dist/lib/libpam/openpam_free_data.c \
src/external/bsd/openpam/dist/lib/libpam/openpam_free_envlist.c \
src/external/bsd/openpam/dist/lib/libpam/openpam_get_feature.c \
src/external/bsd/openpam/dist/lib/libpam/openpam_get_option.c \
src/external/bsd/openpam/dist/lib/libpam/openpam_impl.h \
src/external/bsd/openpam/dist/lib/libpam/openpam_load.c \
src/external/bsd/openpam/dist/lib/libpam/openpam_log.c \
src/external/bsd/openpam/dist/lib/libpam/openpam_nullconv.c \
src/external/bsd/openpam/dist/lib/libpam/openpam_readline.c \
src/external/bsd/openpam/dist/lib/libpam/openpam_readlinev.c \
src/external/bsd/openpam/dist/lib/libpam/openpam_readword.c \
src/external/bsd/openpam/dist/lib/libpam/openpam_restore_cred.c \
src/external/bsd/openpam/dist/lib/libpam/openpam_set_feature.c \
src/external/bsd/openpam/dist/lib/libpam/openpam_set_option.c \
src/external/bsd/openpam/dist/lib/libpam/openpam_static.c \
src/external/bsd/openpam/dist/lib/libpam/openpam_straddch.c \
src/external/bsd/openpam/dist/lib/libpam/openpam_strlcat.c \
src/external/bsd/openpam/dist/lib/libpam/openpam_strlcat.h \
src/external/bsd/openpam/dist/lib/libpam/openpam_strlcmp.h \
src/external/bsd/openpam/dist/lib/libpam/openpam_strlcpy.c \
src/external/bsd/openpam/dist/lib/libpam/openpam_strlcpy.h \
src/external/bsd/openpam/dist/lib/libpam/openpam_strlset.c \
src/external/bsd/openpam/dist/lib/libpam/openpam_strlset.h \
src/external/bsd/openpam/dist/lib/libpam/openpam_subst.c \
src/external/bsd/openpam/dist/lib/libpam/openpam_ttyconv.c \
src/external/bsd/openpam/dist/lib/libpam/openpam_vasprintf.c \
src/external/bsd/openpam/dist/lib/libpam/openpam_vasprintf.h \
src/external/bsd/openpam/dist/lib/libpam/pam_acct_mgmt.c \
src/external/bsd/openpam/dist/lib/libpam/pam_authenticate.c \
src/external/bsd/openpam/dist/lib/libpam/pam_authenticate_secondary.c \
src/external/bsd/openpam/dist/lib/libpam/pam_chauthtok.c \
src/external/bsd/openpam/dist/lib/libpam/pam_close_session.c \
src/external/bsd/openpam/dist/lib/libpam/pam_end.c \
src/external/bsd/openpam/dist/lib/libpam/pam_error.c \
src/external/bsd/openpam/dist/lib/libpam/pam_get_authtok.c \
src/external/bsd/openpam/dist/lib/libpam/pam_get_data.c \
src/external/bsd/openpam/dist/lib/libpam/pam_get_item.c \
src/external/bsd/openpam/dist/lib/libpam/pam_get_mapped_authtok.c \
src/external/bsd/openpam/dist/lib/libpam/pam_get_mapped_username.c \
src/external/bsd/openpam/dist/lib/libpam/pam_get_user.c \
src/external/bsd/openpam/dist/lib/libpam/pam_getenv.c \
src/external/bsd/openpam/dist/lib/libpam/pam_getenvlist.c \
src/external/bsd/openpam/dist/lib/libpam/pam_info.c \
src/external/bsd/openpam/dist/lib/libpam/pam_open_session.c \
src/external/bsd/openpam/dist/lib/libpam/pam_prompt.c \
src/external/bsd/openpam/dist/lib/libpam/pam_putenv.c \
src/external/bsd/openpam/dist/lib/libpam/pam_set_data.c \
src/external/bsd/openpam/dist/lib/libpam/pam_set_item.c \
src/external/bsd/openpam/dist/lib/libpam/pam_set_mapped_authtok.c \
src/external/bsd/openpam/dist/lib/libpam/pam_set_mapped_username.c \
src/external/bsd/openpam/dist/lib/libpam/pam_setcred.c \
src/external/bsd/openpam/dist/lib/libpam/pam_setenv.c \
src/external/bsd/openpam/dist/lib/libpam/pam_sm_acct_mgmt.c \
src/external/bsd/openpam/dist/lib/libpam/pam_sm_authenticate.c \
src/external/bsd/openpam/dist/lib/libpam/pam_sm_authenticate_secondary.c \
src/external/bsd/openpam/dist/lib/libpam/pam_sm_chauthtok.c \
src/external/bsd/openpam/dist/lib/libpam/pam_sm_close_session.c \
src/external/bsd/openpam/dist/lib/libpam/pam_sm_get_mapped_authtok.c \
src/external/bsd/openpam/dist/lib/libpam/pam_sm_get_mapped_username.c \
src/external/bsd/openpam/dist/lib/libpam/pam_sm_open_session.c \
src/external/bsd/openpam/dist/lib/libpam/pam_sm_set_mapped_authtok.c \
src/external/bsd/openpam/dist/lib/libpam/pam_sm_set_mapped_username.c \
src/external/bsd/openpam/dist/lib/libpam/pam_sm_setcred.c \
src/external/bsd/openpam/dist/lib/libpam/pam_start.c \
src/external/bsd/openpam/dist/lib/libpam/pam_strerror.c \
src/external/bsd/openpam/dist/lib/libpam/pam_verror.c \
src/external/bsd/openpam/dist/lib/libpam/pam_vinfo.c \
src/external/bsd/openpam/dist/lib/libpam/pam_vprompt.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openpam/dist/misc/gendoc.pl
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/openpam/dist/modules/pam_deny/pam_deny.c
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/openpam/dist/modules/pam_permit/pam_permit.c
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/openpam/dist/modules/pam_unix/pam_unix.c
cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/openpam/dist/t/t.h \
src/external/bsd/openpam/dist/t/t_main.c
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/openpam/dist/t/t_file.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/openpam/dist/t/t_openpam_readlinev.c \
src/external/bsd/openpam/dist/t/t_openpam_readword.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
