Module Name: src
Committed By: christos
Date: Fri Dec 27 20:11:27 UTC 2013
Modified Files:
src/external/bsd/openpam/dist/doc/man: pam_get_authtok.3 pam_get_user.3
Log Message:
remove conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/openpam/dist/doc/man/pam_get_authtok.3 \
src/external/bsd/openpam/dist/doc/man/pam_get_user.3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/openpam/dist/doc/man/pam_get_authtok.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_get_authtok.3:1.4 src/external/bsd/openpam/dist/doc/man/pam_get_authtok.3:1.5
--- src/external/bsd/openpam/dist/doc/man/pam_get_authtok.3:1.4 Fri Dec 27 15:10:20 2013
+++ src/external/bsd/openpam/dist/doc/man/pam_get_authtok.3 Fri Dec 27 15:11:26 2013
@@ -1,4 +1,4 @@
-.\" $NetBSD: pam_get_authtok.3,v 1.4 2013/12/27 20:10:20 christos Exp $
+.\" $NetBSD: pam_get_authtok.3,v 1.5 2013/12/27 20:11:26 christos Exp $
.\"
.\" Generated from pam_get_authtok.c by gendoc.pl
.\" Id: pam_get_authtok.c 670 2013-03-17 19:26:07Z des
@@ -76,8 +76,6 @@ If there is a mismatch,
.Fn pam_get_authtok
will return
.Dv PAM_TRY_AGAIN .
-<<<<<<< pam_get_authtok.3
-=======
.Sh MODULE OPTIONS
When called by a service module,
.Fn pam_get_authtok
@@ -122,7 +120,6 @@ value, or
.Dv PAM_AUTH_ERR
if there is none.
.El
->>>>>>> 1.1.1.3
.Sh RETURN VALUES
The
.Fn pam_get_authtok
Index: src/external/bsd/openpam/dist/doc/man/pam_get_user.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_get_user.3:1.4 src/external/bsd/openpam/dist/doc/man/pam_get_user.3:1.5
--- src/external/bsd/openpam/dist/doc/man/pam_get_user.3:1.4 Fri Dec 27 15:10:20 2013
+++ src/external/bsd/openpam/dist/doc/man/pam_get_user.3 Fri Dec 27 15:11:26 2013
@@ -1,4 +1,4 @@
-.\" $NetBSD: pam_get_user.3,v 1.4 2013/12/27 20:10:20 christos Exp $
+.\" $NetBSD: pam_get_user.3,v 1.5 2013/12/27 20:11:26 christos Exp $
.\"
.\" Generated from pam_get_user.c by gendoc.pl
.\" Id: pam_get_user.c 670 2013-03-17 19:26:07Z des
@@ -64,10 +64,7 @@ This option overrides both the
argument and the
.Dv PAM_USER_PROMPT
item.
-<<<<<<< pam_get_user.3
-=======
.El
->>>>>>> 1.1.1.3
.Sh RETURN VALUES
The
.Fn pam_get_user
