Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove conflicts

Browse Source
This commit is contained in:
christos 2013-12-27 20:11:26 +00:00
parent 8fa0fefe00
commit e9a1eddb86
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
external/bsd/openpam/dist/doc/man/pam_get_authtok.3 vendored
View File

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

5
external/bsd/openpam/dist/doc/man/pam_get_user.3 vendored
View File

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