Module Name:	src
Committed By:	christos
Date:		Sat Feb 26 20:58:25 UTC 2005

Modified Files:
	src/dist/openpam/doc/man: openpam.3 openpam_borrow_cred.3
	    openpam_free_data.3 openpam_get_option.3 openpam_log.3
	    openpam_nullconv.3 openpam_readline.3 openpam_restore_cred.3
	    openpam_set_option.3 openpam_ttyconv.3 pam.3 pam_acct_mgmt.3
	    pam_authenticate.3 pam_chauthtok.3 pam_close_session.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/dist/openpam/include/security: openpam.h
	src/dist/openpam/lib: openpam_borrow_cred.c openpam_free_data.c
	    openpam_impl.h openpam_nullconv.c openpam_restore_cred.c
	    openpam_ttyconv.c pam_get_authtok.c pam_get_data.c pam_get_user.c
	    pam_open_session.c pam_strerror.c
	src/dist/openpam/misc: gendoc.pl
Removed Files:
	src/dist/openpam: configure.in ltconfig mkinstalldirs stamp-h.in

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.1.1.1 -r0 src/dist/openpam/configure.in \
    src/dist/openpam/ltconfig src/dist/openpam/mkinstalldirs \
    src/dist/openpam/stamp-h.in
cvs rdiff -r1.2 -r1.3 src/dist/openpam/doc/man/openpam.3 \
    src/dist/openpam/doc/man/openpam_free_data.3 \
    src/dist/openpam/doc/man/openpam_log.3 \
    src/dist/openpam/doc/man/openpam_readline.3 \
    src/dist/openpam/doc/man/pam.3 src/dist/openpam/doc/man/pam_acct_mgmt.3 \
    src/dist/openpam/doc/man/pam_authenticate.3 \
    src/dist/openpam/doc/man/pam_chauthtok.3 \
    src/dist/openpam/doc/man/pam_close_session.3 \
    src/dist/openpam/doc/man/pam_end.3 \
    src/dist/openpam/doc/man/pam_get_data.3 \
    src/dist/openpam/doc/man/pam_open_session.3 \
    src/dist/openpam/doc/man/pam_set_item.3 \
    src/dist/openpam/doc/man/pam_setcred.3 \
    src/dist/openpam/doc/man/pam_sm_acct_mgmt.3 \
    src/dist/openpam/doc/man/pam_sm_authenticate.3 \
    src/dist/openpam/doc/man/pam_sm_chauthtok.3 \
    src/dist/openpam/doc/man/pam_sm_close_session.3 \
    src/dist/openpam/doc/man/pam_sm_open_session.3 \
    src/dist/openpam/doc/man/pam_sm_setcred.3 \
    src/dist/openpam/doc/man/pam_strerror.3
cvs rdiff -r1.5 -r1.6 src/dist/openpam/doc/man/openpam_borrow_cred.3 \
    src/dist/openpam/doc/man/openpam_restore_cred.3
cvs rdiff -r1.3 -r1.4 src/dist/openpam/doc/man/openpam_get_option.3 \
    src/dist/openpam/doc/man/openpam_nullconv.3 \
    src/dist/openpam/doc/man/openpam_set_option.3 \
    src/dist/openpam/doc/man/openpam_ttyconv.3 \
    src/dist/openpam/doc/man/pam_error.3 \
    src/dist/openpam/doc/man/pam_get_authtok.3 \
    src/dist/openpam/doc/man/pam_get_user.3 \
    src/dist/openpam/doc/man/pam_getenv.3 \
    src/dist/openpam/doc/man/pam_getenvlist.3 \
    src/dist/openpam/doc/man/pam_info.3 src/dist/openpam/doc/man/pam_prompt.3 \
    src/dist/openpam/doc/man/pam_putenv.3 \
    src/dist/openpam/doc/man/pam_setenv.3 \
    src/dist/openpam/doc/man/pam_start.3 \
    src/dist/openpam/doc/man/pam_verror.3 \
    src/dist/openpam/doc/man/pam_vinfo.3 \
    src/dist/openpam/doc/man/pam_vprompt.3
cvs rdiff -r1.4 -r1.5 src/dist/openpam/doc/man/pam_get_item.3 \
    src/dist/openpam/doc/man/pam_set_data.3
cvs rdiff -r1.6 -r1.7 src/dist/openpam/include/security/openpam.h
cvs rdiff -r1.4 -r1.5 src/dist/openpam/lib/openpam_borrow_cred.c
cvs rdiff -r1.2 -r1.3 src/dist/openpam/lib/openpam_free_data.c \
    src/dist/openpam/lib/pam_get_authtok.c \
    src/dist/openpam/lib/pam_get_data.c src/dist/openpam/lib/pam_get_user.c \
    src/dist/openpam/lib/pam_open_session.c \
    src/dist/openpam/lib/pam_strerror.c
cvs rdiff -r1.3 -r1.4 src/dist/openpam/lib/openpam_impl.h \
    src/dist/openpam/lib/openpam_nullconv.c \
    src/dist/openpam/lib/openpam_restore_cred.c
cvs rdiff -r1.5 -r1.6 src/dist/openpam/lib/openpam_ttyconv.c
cvs rdiff -r1.2 -r1.3 src/dist/openpam/misc/gendoc.pl

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.