CVS commit: src/external/bsd/openpam/dist

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Fri Oct 24 18:27:13 UTC 2014

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/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

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/openpam/dist/bin/pamtest/pamtest.1
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openpam/dist/bin/pamtest/pamtest.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/openpam/dist/bin/su/su.1
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openpam/dist/bin/su/su.c
cvs rdiff -u -r1.5 -r1.6 \
    src/external/bsd/openpam/dist/modules/pam_deny/pam_deny.c
cvs rdiff -u -r1.5 -r1.6 \
    src/external/bsd/openpam/dist/modules/pam_permit/pam_permit.c
cvs rdiff -u -r1.5 -r1.6 \
    src/external/bsd/openpam/dist/modules/pam_unix/pam_unix.c

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