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

resolve conflicts

This commit is contained in:
christos 2006-02-05 02:37:45 +00:00
parent 70d3347b2d
commit aad78462b6
48 changed files with 106 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dist/openpam/doc/man/openpam.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: openpam.3,v 1.3 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: openpam.3,v 1.4 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt OPENPAM 3 .Dt OPENPAM 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/openpam_borrow_cred.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: openpam_borrow_cred.3,v 1.6 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: openpam_borrow_cred.3,v 1.7 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt OPENPAM_BORROW_CRED 3 .Dt OPENPAM_BORROW_CRED 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/openpam_free_data.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: openpam_free_data.3,v 1.3 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: openpam_free_data.3,v 1.4 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt OPENPAM_FREE_DATA 3 .Dt OPENPAM_FREE_DATA 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/openpam_get_option.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: openpam_get_option.3,v 1.4 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: openpam_get_option.3,v 1.5 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt OPENPAM_GET_OPTION 3 .Dt OPENPAM_GET_OPTION 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/openpam_log.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: openpam_log.3,v 1.3 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: openpam_log.3,v 1.4 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt OPENPAM_LOG 3 .Dt OPENPAM_LOG 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/openpam_nullconv.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: openpam_nullconv.3,v 1.5 2005/02/28 10:48:08 wiz Exp $ .\" $NetBSD: openpam_nullconv.3,v 1.6 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt OPENPAM_NULLCONV 3 .Dt OPENPAM_NULLCONV 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/openpam_readline.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: openpam_readline.3,v 1.3 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: openpam_readline.3,v 1.4 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt OPENPAM_READLINE 3 .Dt OPENPAM_READLINE 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/openpam_restore_cred.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: openpam_restore_cred.3,v 1.6 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: openpam_restore_cred.3,v 1.7 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt OPENPAM_RESTORE_CRED 3 .Dt OPENPAM_RESTORE_CRED 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/openpam_set_option.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: openpam_set_option.3,v 1.4 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: openpam_set_option.3,v 1.5 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt OPENPAM_SET_OPTION 3 .Dt OPENPAM_SET_OPTION 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/openpam_ttyconv.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: openpam_ttyconv.3,v 1.4 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: openpam_ttyconv.3,v 1.5 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt OPENPAM_TTYCONV 3 .Dt OPENPAM_TTYCONV 3
.Os .Os
.Sh NAME .Sh NAME

10
dist/openpam/doc/man/pam.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pam.3,v 1.3 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: pam.3,v 1.4 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt PAM 3 .Dt PAM 3
.Os .Os
.Sh NAME .Sh NAME
@ -268,15 +268,15 @@ Unknown user.
.Xr pam_conv 3 , .Xr pam_conv 3 ,
.Xr pam_end 3 , .Xr pam_end 3 ,
.Xr pam_get_data 3 , .Xr pam_get_data 3 ,
.Xr pam_get_item 3 ,
.Xr pam_get_user 3 ,
.Xr pam_getenv 3 , .Xr pam_getenv 3 ,
.Xr pam_getenvlist 3 , .Xr pam_getenvlist 3 ,
.Xr pam_get_item 3 ,
.Xr pam_get_user 3 ,
.Xr pam_open_session 3 , .Xr pam_open_session 3 ,
.Xr pam_putenv 3 , .Xr pam_putenv 3 ,
.Xr pam_setcred 3 ,
.Xr pam_set_data 3 , .Xr pam_set_data 3 ,
.Xr pam_set_item 3 , .Xr pam_set_item 3 ,
.Xr pam_setcred 3 ,
.Xr pam_start 3 , .Xr pam_start 3 ,
.Xr pam_strerror 3 .Xr pam_strerror 3
.Sh STANDARDS .Sh STANDARDS

4
dist/openpam/doc/man/pam_acct_mgmt.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pam_acct_mgmt.3,v 1.3 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: pam_acct_mgmt.3,v 1.4 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt PAM_ACCT_MGMT 3 .Dt PAM_ACCT_MGMT 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/pam_authenticate.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pam_authenticate.3,v 1.3 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: pam_authenticate.3,v 1.4 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt PAM_AUTHENTICATE 3 .Dt PAM_AUTHENTICATE 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/pam_chauthtok.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pam_chauthtok.3,v 1.3 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: pam_chauthtok.3,v 1.4 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt PAM_CHAUTHTOK 3 .Dt PAM_CHAUTHTOK 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/pam_close_session.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pam_close_session.3,v 1.3 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: pam_close_session.3,v 1.4 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt PAM_CLOSE_SESSION 3 .Dt PAM_CLOSE_SESSION 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/pam_end.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pam_end.3,v 1.3 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: pam_end.3,v 1.4 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt PAM_END 3 .Dt PAM_END 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/pam_error.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pam_error.3,v 1.4 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: pam_error.3,v 1.5 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt PAM_ERROR 3 .Dt PAM_ERROR 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/pam_get_authtok.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pam_get_authtok.3,v 1.4 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: pam_get_authtok.3,v 1.5 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt PAM_GET_AUTHTOK 3 .Dt PAM_GET_AUTHTOK 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/pam_get_data.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pam_get_data.3,v 1.3 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: pam_get_data.3,v 1.4 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt PAM_GET_DATA 3 .Dt PAM_GET_DATA 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/pam_get_item.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pam_get_item.3,v 1.7 2005/03/04 12:32:31 wiz Exp $ .\" $NetBSD: pam_get_item.3,v 1.8 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd March 2, 2005 .Dd June 16, 2005
.Dt PAM_GET_ITEM 3 .Dt PAM_GET_ITEM 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/pam_get_user.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pam_get_user.3,v 1.4 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: pam_get_user.3,v 1.5 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt PAM_GET_USER 3 .Dt PAM_GET_USER 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/pam_getenv.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pam_getenv.3,v 1.4 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: pam_getenv.3,v 1.5 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt PAM_GETENV 3 .Dt PAM_GETENV 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/pam_getenvlist.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pam_getenvlist.3,v 1.4 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: pam_getenvlist.3,v 1.5 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt PAM_GETENVLIST 3 .Dt PAM_GETENVLIST 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/pam_info.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pam_info.3,v 1.4 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: pam_info.3,v 1.5 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt PAM_INFO 3 .Dt PAM_INFO 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/pam_open_session.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pam_open_session.3,v 1.3 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: pam_open_session.3,v 1.4 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt PAM_OPEN_SESSION 3 .Dt PAM_OPEN_SESSION 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/pam_prompt.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pam_prompt.3,v 1.4 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: pam_prompt.3,v 1.5 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt PAM_PROMPT 3 .Dt PAM_PROMPT 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/pam_putenv.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pam_putenv.3,v 1.4 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: pam_putenv.3,v 1.5 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt PAM_PUTENV 3 .Dt PAM_PUTENV 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/pam_set_data.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pam_set_data.3,v 1.5 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: pam_set_data.3,v 1.6 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt PAM_SET_DATA 3 .Dt PAM_SET_DATA 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/pam_set_item.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pam_set_item.3,v 1.3 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: pam_set_item.3,v 1.4 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt PAM_SET_ITEM 3 .Dt PAM_SET_ITEM 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/pam_setcred.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pam_setcred.3,v 1.3 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: pam_setcred.3,v 1.4 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt PAM_SETCRED 3 .Dt PAM_SETCRED 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/pam_setenv.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pam_setenv.3,v 1.4 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: pam_setenv.3,v 1.5 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt PAM_SETENV 3 .Dt PAM_SETENV 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/pam_sm_acct_mgmt.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pam_sm_acct_mgmt.3,v 1.3 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: pam_sm_acct_mgmt.3,v 1.4 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt PAM_SM_ACCT_MGMT 3 .Dt PAM_SM_ACCT_MGMT 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/pam_sm_authenticate.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pam_sm_authenticate.3,v 1.3 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: pam_sm_authenticate.3,v 1.4 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt PAM_SM_AUTHENTICATE 3 .Dt PAM_SM_AUTHENTICATE 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/pam_sm_chauthtok.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pam_sm_chauthtok.3,v 1.3 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: pam_sm_chauthtok.3,v 1.4 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt PAM_SM_CHAUTHTOK 3 .Dt PAM_SM_CHAUTHTOK 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/pam_sm_close_session.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pam_sm_close_session.3,v 1.3 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: pam_sm_close_session.3,v 1.4 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt PAM_SM_CLOSE_SESSION 3 .Dt PAM_SM_CLOSE_SESSION 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/pam_sm_open_session.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pam_sm_open_session.3,v 1.3 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: pam_sm_open_session.3,v 1.4 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt PAM_SM_OPEN_SESSION 3 .Dt PAM_SM_OPEN_SESSION 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/pam_sm_setcred.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pam_sm_setcred.3,v 1.3 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: pam_sm_setcred.3,v 1.4 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt PAM_SM_SETCRED 3 .Dt PAM_SM_SETCRED 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/pam_start.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pam_start.3,v 1.4 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: pam_start.3,v 1.5 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt PAM_START 3 .Dt PAM_START 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/pam_strerror.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pam_strerror.3,v 1.3 2005/02/26 20:58:24 christos Exp $ .\" $NetBSD: pam_strerror.3,v 1.4 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt PAM_STRERROR 3 .Dt PAM_STRERROR 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/pam_verror.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pam_verror.3,v 1.4 2005/02/26 20:58:25 christos Exp $ .\" $NetBSD: pam_verror.3,v 1.5 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt PAM_VERROR 3 .Dt PAM_VERROR 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/pam_vinfo.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pam_vinfo.3,v 1.4 2005/02/26 20:58:25 christos Exp $ .\" $NetBSD: pam_vinfo.3,v 1.5 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt PAM_VINFO 3 .Dt PAM_VINFO 3
.Os .Os
.Sh NAME .Sh NAME

4
dist/openpam/doc/man/pam_vprompt.3 vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pam_vprompt.3,v 1.4 2005/02/26 20:58:25 christos Exp $ .\" $NetBSD: pam_vprompt.3,v 1.5 2006/02/05 02:37:45 christos Exp $
.\" .\"
.\"- .\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@ -35,7 +35,7 @@
.\" .\"
.\" $P4$ .\" $P4$
.\" .\"
.Dd February 1, 2005 .Dd June 16, 2005
.Dt PAM_VPROMPT 3 .Dt PAM_VPROMPT 3
.Os .Os
.Sh NAME .Sh NAME

1
dist/openpam/include/security/openpam.h vendored
View File

@ -307,7 +307,6 @@ DATA_SET(_openpam_static_modules, _pam_module)
#if defined(__NetBSD__) #if defined(__NetBSD__)
# define PAM_SOEXT ".so" # define PAM_SOEXT ".so"
# define PAM_SOPREFIX "/usr/lib/security/"
# if !defined(__GNUC__) || defined(NO_STATIC_MODULES) # if !defined(__GNUC__) || defined(NO_STATIC_MODULES)
# undef OPENPAM_STATIC_MODULE /* disable static module macros */ # undef OPENPAM_STATIC_MODULE /* disable static module macros */
# undef OPENPAM_STATIC_MODULES /* disable static module support in libpam */ # undef OPENPAM_STATIC_MODULES /* disable static module support in libpam */

6
dist/openpam/lib/openpam_dynamic.c vendored
View File

@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $P4: //depot/projects/openpam/lib/openpam_dynamic.c#13 $ * $P4: //depot/projects/openpam/lib/openpam_dynamic.c#14 $
*/ */
#include <dlfcn.h> #include <dlfcn.h>
@ -57,8 +57,8 @@ pam_module_t *
openpam_dynamic(const char *path) openpam_dynamic(const char *path)
{ {
pam_module_t *module; pam_module_t *module;
char *vpath;
const char *prefix; const char *prefix;
char *vpath;
void *dlh; void *dlh;
int i; int i;
@ -68,7 +68,7 @@ openpam_dynamic(const char *path)
/* Prepend the standard prefix if not an absolute pathname. */ /* Prepend the standard prefix if not an absolute pathname. */
if (path[0] != '/') if (path[0] != '/')
prefix = PAM_SOPREFIX; prefix = OPENPAM_MODULES_DIR;
else else
prefix = ""; prefix = "";

2
dist/openpam/lib/openpam_load.c vendored
View File

@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $P4: //depot/projects/openpam/lib/openpam_load.c#20 $ * $P4: //depot/projects/openpam/lib/openpam_load.c#21 $
*/ */
#include <dlfcn.h> #include <dlfcn.h>

8
dist/openpam/lib/openpam_readline.c vendored
View File

@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $P4: //depot/projects/openpam/lib/openpam_readline.c#2 $ * $P4: //depot/projects/openpam/lib/openpam_readline.c#3 $
*/ */
#include <ctype.h> #include <ctype.h>
@ -52,7 +52,7 @@
char * char *
openpam_readline(FILE *f, int *lineno, size_t *lenp) openpam_readline(FILE *f, int *lineno, size_t *lenp)
{ {
char *line; unsigned char *line;
size_t len, size; size_t len, size;
int ch; int ch;
@ -63,7 +63,7 @@ openpam_readline(FILE *f, int *lineno, size_t *lenp)
#define line_putch(ch) do { \ #define line_putch(ch) do { \
if (len >= size - 1) { \ if (len >= size - 1) { \
char *tmp = realloc(line, size *= 2); \ unsigned char *tmp = realloc(line, size *= 2); \
if (tmp == NULL) \ if (tmp == NULL) \
goto fail; \ goto fail; \
line = tmp; \ line = tmp; \
@ -124,7 +124,7 @@ openpam_readline(FILE *f, int *lineno, size_t *lenp)
if (lenp != NULL) if (lenp != NULL)
*lenp = len; *lenp = len;
return (line); return ((char *)line);
fail: fail:
FREE(line); FREE(line);
return (NULL); return (NULL);

2
dist/openpam/lib/openpam_ttyconv.c vendored
View File

@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#25 $ * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#26 $
*/ */
#include <sys/types.h> #include <sys/types.h>

12
dist/openpam/misc/gendoc.pl vendored
View File

@ -32,7 +32,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE. # SUCH DAMAGE.
# #
# $P4: //depot/projects/openpam/misc/gendoc.pl#29 $ # $P4: //depot/projects/openpam/misc/gendoc.pl#30 $
# #
use strict; use strict;
@ -342,13 +342,21 @@ sub expand_errors($) {
$func->{'errors'} = [ sort(keys(%errors)) ]; $func->{'errors'} = [ sort(keys(%errors)) ];
} }
sub dictionary_order($$) {
my ($a, $b) = @_;
$a =~ s/[^[:alpha:]]//g;
$b =~ s/[^[:alpha:]]//g;
$a cmp $b;
}
sub genxref($) { sub genxref($) {
my $xref = shift; # References my $xref = shift; # References
my $mdoc = ''; my $mdoc = '';
my @refs = (); my @refs = ();
foreach my $sect (sort(keys(%{$xref}))) { foreach my $sect (sort(keys(%{$xref}))) {
foreach my $page (sort(keys(%{$xref->{$sect}}))) { foreach my $page (sort(dictionary_order keys(%{$xref->{$sect}}))) {
push(@refs, "$page $sect"); push(@refs, "$page $sect");
} }
} }