diff --git a/dist/openpam/doc/man/openpam.3 b/dist/openpam/doc/man/openpam.3
index 2a8a024b8b21..7b7280bc667c 100644
--- a/dist/openpam/doc/man/openpam.3
+++ b/dist/openpam/doc/man/openpam.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt OPENPAM 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/openpam_borrow_cred.3 b/dist/openpam/doc/man/openpam_borrow_cred.3
index dca2f69218f0..1d6c1eb060ed 100644
--- a/dist/openpam/doc/man/openpam_borrow_cred.3
+++ b/dist/openpam/doc/man/openpam_borrow_cred.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt OPENPAM_BORROW_CRED 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/openpam_free_data.3 b/dist/openpam/doc/man/openpam_free_data.3
index 4cb0568048ea..305709e1fcd9 100644
--- a/dist/openpam/doc/man/openpam_free_data.3
+++ b/dist/openpam/doc/man/openpam_free_data.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt OPENPAM_FREE_DATA 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/openpam_get_option.3 b/dist/openpam/doc/man/openpam_get_option.3
index 83b1e9c55d66..799b870fe75d 100644
--- a/dist/openpam/doc/man/openpam_get_option.3
+++ b/dist/openpam/doc/man/openpam_get_option.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt OPENPAM_GET_OPTION 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/openpam_log.3 b/dist/openpam/doc/man/openpam_log.3
index 397877b02aa4..e4b5b1d1b470 100644
--- a/dist/openpam/doc/man/openpam_log.3
+++ b/dist/openpam/doc/man/openpam_log.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt OPENPAM_LOG 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/openpam_nullconv.3 b/dist/openpam/doc/man/openpam_nullconv.3
index ef3a1c5fa46f..b27116973a7c 100644
--- a/dist/openpam/doc/man/openpam_nullconv.3
+++ b/dist/openpam/doc/man/openpam_nullconv.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt OPENPAM_NULLCONV 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/openpam_readline.3 b/dist/openpam/doc/man/openpam_readline.3
index be3d9d2549d8..76bcbad103c3 100644
--- a/dist/openpam/doc/man/openpam_readline.3
+++ b/dist/openpam/doc/man/openpam_readline.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt OPENPAM_READLINE 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/openpam_restore_cred.3 b/dist/openpam/doc/man/openpam_restore_cred.3
index e367642ea6af..7ef13bdc9486 100644
--- a/dist/openpam/doc/man/openpam_restore_cred.3
+++ b/dist/openpam/doc/man/openpam_restore_cred.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt OPENPAM_RESTORE_CRED 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/openpam_set_option.3 b/dist/openpam/doc/man/openpam_set_option.3
index 5051e78e7fc2..1c9c1bb33af7 100644
--- a/dist/openpam/doc/man/openpam_set_option.3
+++ b/dist/openpam/doc/man/openpam_set_option.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt OPENPAM_SET_OPTION 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/openpam_ttyconv.3 b/dist/openpam/doc/man/openpam_ttyconv.3
index 5257dda36706..3b884d5979ea 100644
--- a/dist/openpam/doc/man/openpam_ttyconv.3
+++ b/dist/openpam/doc/man/openpam_ttyconv.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt OPENPAM_TTYCONV 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/pam.3 b/dist/openpam/doc/man/pam.3
index a44725587282..872eada547f7 100644
--- a/dist/openpam/doc/man/pam.3
+++ b/dist/openpam/doc/man/pam.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt PAM 3
 .Os
 .Sh NAME
@@ -268,15 +268,15 @@ Unknown user.
 .Xr pam_conv 3 ,
 .Xr pam_end 3 ,
 .Xr pam_get_data 3 ,
-.Xr pam_get_item 3 ,
-.Xr pam_get_user 3 ,
 .Xr pam_getenv 3 ,
 .Xr pam_getenvlist 3 ,
+.Xr pam_get_item 3 ,
+.Xr pam_get_user 3 ,
 .Xr pam_open_session 3 ,
 .Xr pam_putenv 3 ,
+.Xr pam_setcred 3 ,
 .Xr pam_set_data 3 ,
 .Xr pam_set_item 3 ,
-.Xr pam_setcred 3 ,
 .Xr pam_start 3 ,
 .Xr pam_strerror 3
 .Sh STANDARDS
diff --git a/dist/openpam/doc/man/pam_acct_mgmt.3 b/dist/openpam/doc/man/pam_acct_mgmt.3
index 402ffd49cda8..8067ef7e5d5d 100644
--- a/dist/openpam/doc/man/pam_acct_mgmt.3
+++ b/dist/openpam/doc/man/pam_acct_mgmt.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt PAM_ACCT_MGMT 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/pam_authenticate.3 b/dist/openpam/doc/man/pam_authenticate.3
index bcd4542e09ff..5808411f98cc 100644
--- a/dist/openpam/doc/man/pam_authenticate.3
+++ b/dist/openpam/doc/man/pam_authenticate.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt PAM_AUTHENTICATE 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/pam_chauthtok.3 b/dist/openpam/doc/man/pam_chauthtok.3
index d5340726a5ba..2deeb93a58bf 100644
--- a/dist/openpam/doc/man/pam_chauthtok.3
+++ b/dist/openpam/doc/man/pam_chauthtok.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt PAM_CHAUTHTOK 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/pam_close_session.3 b/dist/openpam/doc/man/pam_close_session.3
index f23bc460ac3c..85c40b3af792 100644
--- a/dist/openpam/doc/man/pam_close_session.3
+++ b/dist/openpam/doc/man/pam_close_session.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt PAM_CLOSE_SESSION 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/pam_end.3 b/dist/openpam/doc/man/pam_end.3
index 3a359649a577..63c4192ca6c6 100644
--- a/dist/openpam/doc/man/pam_end.3
+++ b/dist/openpam/doc/man/pam_end.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt PAM_END 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/pam_error.3 b/dist/openpam/doc/man/pam_error.3
index ab92c2549e2f..bffbaf3ed4af 100644
--- a/dist/openpam/doc/man/pam_error.3
+++ b/dist/openpam/doc/man/pam_error.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt PAM_ERROR 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/pam_get_authtok.3 b/dist/openpam/doc/man/pam_get_authtok.3
index aeede2415bba..712c4296477f 100644
--- a/dist/openpam/doc/man/pam_get_authtok.3
+++ b/dist/openpam/doc/man/pam_get_authtok.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt PAM_GET_AUTHTOK 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/pam_get_data.3 b/dist/openpam/doc/man/pam_get_data.3
index 951dfbf8fbc7..50582a7b9343 100644
--- a/dist/openpam/doc/man/pam_get_data.3
+++ b/dist/openpam/doc/man/pam_get_data.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt PAM_GET_DATA 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/pam_get_item.3 b/dist/openpam/doc/man/pam_get_item.3
index abcbbebd6cba..895cb961f558 100644
--- a/dist/openpam/doc/man/pam_get_item.3
+++ b/dist/openpam/doc/man/pam_get_item.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd March 2, 2005
+.Dd June 16, 2005
 .Dt PAM_GET_ITEM 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/pam_get_user.3 b/dist/openpam/doc/man/pam_get_user.3
index 7a171d9bd5ef..a8a54e251d86 100644
--- a/dist/openpam/doc/man/pam_get_user.3
+++ b/dist/openpam/doc/man/pam_get_user.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt PAM_GET_USER 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/pam_getenv.3 b/dist/openpam/doc/man/pam_getenv.3
index 09e585c9f6cb..da92717121ac 100644
--- a/dist/openpam/doc/man/pam_getenv.3
+++ b/dist/openpam/doc/man/pam_getenv.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt PAM_GETENV 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/pam_getenvlist.3 b/dist/openpam/doc/man/pam_getenvlist.3
index f51d873bf0e2..6026ee0cc32d 100644
--- a/dist/openpam/doc/man/pam_getenvlist.3
+++ b/dist/openpam/doc/man/pam_getenvlist.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt PAM_GETENVLIST 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/pam_info.3 b/dist/openpam/doc/man/pam_info.3
index 856f7ec00b5f..a043911b675b 100644
--- a/dist/openpam/doc/man/pam_info.3
+++ b/dist/openpam/doc/man/pam_info.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt PAM_INFO 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/pam_open_session.3 b/dist/openpam/doc/man/pam_open_session.3
index 8b81beb0538e..77d3f356e8d7 100644
--- a/dist/openpam/doc/man/pam_open_session.3
+++ b/dist/openpam/doc/man/pam_open_session.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt PAM_OPEN_SESSION 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/pam_prompt.3 b/dist/openpam/doc/man/pam_prompt.3
index 648e9af74f76..85c370da220f 100644
--- a/dist/openpam/doc/man/pam_prompt.3
+++ b/dist/openpam/doc/man/pam_prompt.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt PAM_PROMPT 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/pam_putenv.3 b/dist/openpam/doc/man/pam_putenv.3
index 460a41c56cf9..38e8d8d18e84 100644
--- a/dist/openpam/doc/man/pam_putenv.3
+++ b/dist/openpam/doc/man/pam_putenv.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt PAM_PUTENV 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/pam_set_data.3 b/dist/openpam/doc/man/pam_set_data.3
index 401e13be3f52..17ab78861b1a 100644
--- a/dist/openpam/doc/man/pam_set_data.3
+++ b/dist/openpam/doc/man/pam_set_data.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt PAM_SET_DATA 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/pam_set_item.3 b/dist/openpam/doc/man/pam_set_item.3
index ad71f73ce4a9..62891f1e631a 100644
--- a/dist/openpam/doc/man/pam_set_item.3
+++ b/dist/openpam/doc/man/pam_set_item.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt PAM_SET_ITEM 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/pam_setcred.3 b/dist/openpam/doc/man/pam_setcred.3
index 82152b45f696..773d4c112b54 100644
--- a/dist/openpam/doc/man/pam_setcred.3
+++ b/dist/openpam/doc/man/pam_setcred.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt PAM_SETCRED 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/pam_setenv.3 b/dist/openpam/doc/man/pam_setenv.3
index 29c661098cb2..b556ffabbb8d 100644
--- a/dist/openpam/doc/man/pam_setenv.3
+++ b/dist/openpam/doc/man/pam_setenv.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt PAM_SETENV 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/pam_sm_acct_mgmt.3 b/dist/openpam/doc/man/pam_sm_acct_mgmt.3
index b57ebc40e5a0..96a80b309e7d 100644
--- a/dist/openpam/doc/man/pam_sm_acct_mgmt.3
+++ b/dist/openpam/doc/man/pam_sm_acct_mgmt.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt PAM_SM_ACCT_MGMT 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/pam_sm_authenticate.3 b/dist/openpam/doc/man/pam_sm_authenticate.3
index 6bfb02aec066..ba7dd0b07f75 100644
--- a/dist/openpam/doc/man/pam_sm_authenticate.3
+++ b/dist/openpam/doc/man/pam_sm_authenticate.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt PAM_SM_AUTHENTICATE 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/pam_sm_chauthtok.3 b/dist/openpam/doc/man/pam_sm_chauthtok.3
index a5f690e33958..8450c09b07de 100644
--- a/dist/openpam/doc/man/pam_sm_chauthtok.3
+++ b/dist/openpam/doc/man/pam_sm_chauthtok.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt PAM_SM_CHAUTHTOK 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/pam_sm_close_session.3 b/dist/openpam/doc/man/pam_sm_close_session.3
index d2fb2f5eb797..cfbbdd7e14a3 100644
--- a/dist/openpam/doc/man/pam_sm_close_session.3
+++ b/dist/openpam/doc/man/pam_sm_close_session.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt PAM_SM_CLOSE_SESSION 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/pam_sm_open_session.3 b/dist/openpam/doc/man/pam_sm_open_session.3
index 0a322d04f35b..7774d5991f7c 100644
--- a/dist/openpam/doc/man/pam_sm_open_session.3
+++ b/dist/openpam/doc/man/pam_sm_open_session.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt PAM_SM_OPEN_SESSION 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/pam_sm_setcred.3 b/dist/openpam/doc/man/pam_sm_setcred.3
index ffb9638fb353..af49ea762090 100644
--- a/dist/openpam/doc/man/pam_sm_setcred.3
+++ b/dist/openpam/doc/man/pam_sm_setcred.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt PAM_SM_SETCRED 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/pam_start.3 b/dist/openpam/doc/man/pam_start.3
index f27806c18a52..805c44af9670 100644
--- a/dist/openpam/doc/man/pam_start.3
+++ b/dist/openpam/doc/man/pam_start.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt PAM_START 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/pam_strerror.3 b/dist/openpam/doc/man/pam_strerror.3
index ed2e5e4d58a1..b6c02f3b6e91 100644
--- a/dist/openpam/doc/man/pam_strerror.3
+++ b/dist/openpam/doc/man/pam_strerror.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt PAM_STRERROR 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/pam_verror.3 b/dist/openpam/doc/man/pam_verror.3
index 38a99a0617f9..42b59b1d4ce3 100644
--- a/dist/openpam/doc/man/pam_verror.3
+++ b/dist/openpam/doc/man/pam_verror.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt PAM_VERROR 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/pam_vinfo.3 b/dist/openpam/doc/man/pam_vinfo.3
index 1591ed68d92c..be884885d5ae 100644
--- a/dist/openpam/doc/man/pam_vinfo.3
+++ b/dist/openpam/doc/man/pam_vinfo.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt PAM_VINFO 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/doc/man/pam_vprompt.3 b/dist/openpam/doc/man/pam_vprompt.3
index fdb536addff5..056a01f2f533 100644
--- a/dist/openpam/doc/man/pam_vprompt.3
+++ b/dist/openpam/doc/man/pam_vprompt.3
@@ -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.
@@ -35,7 +35,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd February 1, 2005
+.Dd June 16, 2005
 .Dt PAM_VPROMPT 3
 .Os
 .Sh NAME
diff --git a/dist/openpam/include/security/openpam.h b/dist/openpam/include/security/openpam.h
index beff49950e4a..8bc906e18635 100644
--- a/dist/openpam/include/security/openpam.h
+++ b/dist/openpam/include/security/openpam.h
@@ -307,7 +307,6 @@ DATA_SET(_openpam_static_modules, _pam_module)
 
 #if defined(__NetBSD__)
 # define PAM_SOEXT	".so"
-# define PAM_SOPREFIX	"/usr/lib/security/"
 # if !defined(__GNUC__) || defined(NO_STATIC_MODULES)
 #  undef OPENPAM_STATIC_MODULE  /* disable static module macros */
 #  undef OPENPAM_STATIC_MODULES /* disable static module support in libpam */
diff --git a/dist/openpam/lib/openpam_dynamic.c b/dist/openpam/lib/openpam_dynamic.c
index b8ff80b6b59e..cf7907f4725b 100644
--- a/dist/openpam/lib/openpam_dynamic.c
+++ b/dist/openpam/lib/openpam_dynamic.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_dynamic.c#13 $
+ * $P4: //depot/projects/openpam/lib/openpam_dynamic.c#14 $
  */
 
 #include <dlfcn.h>
@@ -57,8 +57,8 @@ pam_module_t *
 openpam_dynamic(const char *path)
 {
 	pam_module_t *module;
-	char *vpath;
 	const char *prefix;
+	char *vpath;
 	void *dlh;
 	int i;
 
@@ -68,7 +68,7 @@ openpam_dynamic(const char *path)
 
 	/* Prepend the standard prefix if not an absolute pathname. */
 	if (path[0] != '/')
-		prefix = PAM_SOPREFIX;
+		prefix = OPENPAM_MODULES_DIR;
 	else
 		prefix = "";
 
diff --git a/dist/openpam/lib/openpam_load.c b/dist/openpam/lib/openpam_load.c
index 74cb63dac2f8..35d2b1770b3e 100644
--- a/dist/openpam/lib/openpam_load.c
+++ b/dist/openpam/lib/openpam_load.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_load.c#20 $
+ * $P4: //depot/projects/openpam/lib/openpam_load.c#21 $
  */
 
 #include <dlfcn.h>
diff --git a/dist/openpam/lib/openpam_readline.c b/dist/openpam/lib/openpam_readline.c
index 8ff2dd99987d..0697fe943c2f 100644
--- a/dist/openpam/lib/openpam_readline.c
+++ b/dist/openpam/lib/openpam_readline.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_readline.c#2 $
+ * $P4: //depot/projects/openpam/lib/openpam_readline.c#3 $
  */
 
 #include <ctype.h>
@@ -52,7 +52,7 @@
 char *
 openpam_readline(FILE *f, int *lineno, size_t *lenp)
 {
-	char *line;
+	unsigned char *line;
 	size_t len, size;
 	int ch;
 
@@ -63,7 +63,7 @@ openpam_readline(FILE *f, int *lineno, size_t *lenp)
 
 #define line_putch(ch) do { \
 	if (len >= size - 1) { \
-		char *tmp = realloc(line, size *= 2); \
+		unsigned char *tmp = realloc(line, size *= 2); \
 		if (tmp == NULL) \
 			goto fail; \
 		line = tmp; \
@@ -124,7 +124,7 @@ openpam_readline(FILE *f, int *lineno, size_t *lenp)
 
 	if (lenp != NULL)
 		*lenp = len;
-	return (line);
+	return ((char *)line);
  fail:
 	FREE(line);
 	return (NULL);
diff --git a/dist/openpam/lib/openpam_ttyconv.c b/dist/openpam/lib/openpam_ttyconv.c
index f081363b8f41..c42418c1e966 100644
--- a/dist/openpam/lib/openpam_ttyconv.c
+++ b/dist/openpam/lib/openpam_ttyconv.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#25 $
+ * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#26 $
  */
 
 #include <sys/types.h>
diff --git a/dist/openpam/misc/gendoc.pl b/dist/openpam/misc/gendoc.pl
index 9fad412a26e5..1b003ea8a1b9 100644
--- a/dist/openpam/misc/gendoc.pl
+++ b/dist/openpam/misc/gendoc.pl
@@ -32,7 +32,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $P4: //depot/projects/openpam/misc/gendoc.pl#29 $
+# $P4: //depot/projects/openpam/misc/gendoc.pl#30 $
 #
 
 use strict;
@@ -342,13 +342,21 @@ sub expand_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($) {
     my $xref = shift;		# References
 
     my $mdoc = '';
     my @refs = ();
     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");
 	}
     }