Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 7 Jun 2002 09:23:12 -0700 (PDT)
From:      Dag-Erling Smorgrav <des@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 12505 for review
Message-ID:  <200206071623.g57GNCX40963@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12505

Change 12505 by des@des.at.aes.thinksec.com on 2002/06/07 09:22:57

	DBA update and minor whitespace fixes.

Affected files ...

... //depot/projects/openpam/CREDITS#2 edit
... //depot/projects/openpam/LICENSE#5 edit
... //depot/projects/openpam/Makefile#7 edit
... //depot/projects/openpam/bin/Makefile#6 edit
... //depot/projects/openpam/bin/su/Makefile#5 edit
... //depot/projects/openpam/bin/su/su.c#8 edit
... //depot/projects/openpam/doc/Makefile#4 edit
... //depot/projects/openpam/doc/man/Makefile#11 edit
... //depot/projects/openpam/doc/man/pam_conv.3#2 edit
... //depot/projects/openpam/include/security/openpam.h#21 edit
... //depot/projects/openpam/include/security/openpam_version.h#5 edit
... //depot/projects/openpam/include/security/pam_appl.h#10 edit
... //depot/projects/openpam/include/security/pam_constants.h#15 edit
... //depot/projects/openpam/include/security/pam_modules.h#8 edit
... //depot/projects/openpam/include/security/pam_types.h#6 edit
... //depot/projects/openpam/lib/Makefile#16 edit
... //depot/projects/openpam/lib/openpam_borrow_cred.c#2 edit
... //depot/projects/openpam/lib/openpam_configure.c#4 edit
... //depot/projects/openpam/lib/openpam_dispatch.c#15 edit
... //depot/projects/openpam/lib/openpam_dynamic.c#6 edit
... //depot/projects/openpam/lib/openpam_findenv.c#8 edit
... //depot/projects/openpam/lib/openpam_free_data.c#2 edit
... //depot/projects/openpam/lib/openpam_get_option.c#4 edit
... //depot/projects/openpam/lib/openpam_impl.h#15 edit
... //depot/projects/openpam/lib/openpam_load.c#14 edit
... //depot/projects/openpam/lib/openpam_log.c#15 edit
... //depot/projects/openpam/lib/openpam_nullconv.c#3 edit
... //depot/projects/openpam/lib/openpam_restore_cred.c#2 edit
... //depot/projects/openpam/lib/openpam_set_option.c#5 edit
... //depot/projects/openpam/lib/openpam_static.c#5 edit
... //depot/projects/openpam/lib/openpam_ttyconv.c#12 edit
... //depot/projects/openpam/lib/pam_acct_mgmt.c#9 edit
... //depot/projects/openpam/lib/pam_authenticate.c#11 edit
... //depot/projects/openpam/lib/pam_authenticate_secondary.c#6 edit
... //depot/projects/openpam/lib/pam_chauthtok.c#12 edit
... //depot/projects/openpam/lib/pam_close_session.c#9 edit
... //depot/projects/openpam/lib/pam_end.c#10 edit
... //depot/projects/openpam/lib/pam_error.c#7 edit
... //depot/projects/openpam/lib/pam_get_authtok.c#19 edit
... //depot/projects/openpam/lib/pam_get_data.c#8 edit
... //depot/projects/openpam/lib/pam_get_item.c#12 edit
... //depot/projects/openpam/lib/pam_get_mapped_authtok.c#6 edit
... //depot/projects/openpam/lib/pam_get_mapped_username.c#6 edit
... //depot/projects/openpam/lib/pam_get_user.c#12 edit
... //depot/projects/openpam/lib/pam_getenv.c#7 edit
... //depot/projects/openpam/lib/pam_getenvlist.c#9 edit
... //depot/projects/openpam/lib/pam_info.c#7 edit
... //depot/projects/openpam/lib/pam_open_session.c#9 edit
... //depot/projects/openpam/lib/pam_prompt.c#7 edit
... //depot/projects/openpam/lib/pam_putenv.c#8 edit
... //depot/projects/openpam/lib/pam_set_data.c#10 edit
... //depot/projects/openpam/lib/pam_set_item.c#14 edit
... //depot/projects/openpam/lib/pam_set_mapped_authtok.c#6 edit
... //depot/projects/openpam/lib/pam_set_mapped_username.c#6 edit
... //depot/projects/openpam/lib/pam_setcred.c#10 edit
... //depot/projects/openpam/lib/pam_setenv.c#7 edit
... //depot/projects/openpam/lib/pam_sm_acct_mgmt.c#4 edit
... //depot/projects/openpam/lib/pam_sm_authenticate.c#4 edit
... //depot/projects/openpam/lib/pam_sm_authenticate_secondary.c#4 edit
... //depot/projects/openpam/lib/pam_sm_chauthtok.c#5 edit
... //depot/projects/openpam/lib/pam_sm_close_session.c#4 edit
... //depot/projects/openpam/lib/pam_sm_get_mapped_authtok.c#4 edit
... //depot/projects/openpam/lib/pam_sm_get_mapped_username.c#4 edit
... //depot/projects/openpam/lib/pam_sm_open_session.c#4 edit
... //depot/projects/openpam/lib/pam_sm_set_mapped_authtok.c#4 edit
... //depot/projects/openpam/lib/pam_sm_set_mapped_username.c#4 edit
... //depot/projects/openpam/lib/pam_sm_setcred.c#4 edit
... //depot/projects/openpam/lib/pam_start.c#16 edit
... //depot/projects/openpam/lib/pam_strerror.c#10 edit
... //depot/projects/openpam/lib/pam_verror.c#6 edit
... //depot/projects/openpam/lib/pam_vinfo.c#6 edit
... //depot/projects/openpam/lib/pam_vprompt.c#7 edit
... //depot/projects/openpam/misc/gendoc.pl#18 edit
... //depot/projects/openpam/modules/Makefile#7 edit
... //depot/projects/openpam/modules/pam_deny/Makefile#5 edit
... //depot/projects/openpam/modules/pam_deny/pam_deny.c#7 edit
... //depot/projects/openpam/modules/pam_dummy/Makefile#4 edit
... //depot/projects/openpam/modules/pam_dummy/pam_dummy.c#5 edit
... //depot/projects/openpam/modules/pam_permit/Makefile#5 edit
... //depot/projects/openpam/modules/pam_permit/pam_permit.c#7 edit
... //depot/projects/openpam/modules/pam_unix/Makefile#2 edit
... //depot/projects/openpam/modules/pam_unix/pam_unix.c#2 edit

Differences ...

==== //depot/projects/openpam/CREDITS#2 (text+ko) ====

@@ -1,8 +1,8 @@
 
-The OpenPAM library was developed for the FreeBSD Project by ThinkSec
-AS and NAI Labs, the Security Research Division of Network Associates,
-Inc.  under DARPA/SPAWAR contract N66001-01-C-8035 (``CBOSS''), as
-part of the DARPA CHATS research program.
+The OpenPAM library was developed for the FreeBSD Project by ThinkSec AS
+and Network Associates Laboratories, the Security Research Division of
+Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
+(``CBOSS''), as part of the DARPA CHATS research program.
 
 Principal design and development by:
 
@@ -21,4 +21,4 @@
 	Solar Designer <solar@openwall.com>
 	Takanori Saneto <sanewo@ba2.so-net.ne.jp>
 
-$P4: //depot/projects/openpam/CREDITS#1 $
+$P4: //depot/projects/openpam/CREDITS#2 $

==== //depot/projects/openpam/LICENSE#5 (text+ko) ====

@@ -3,9 +3,9 @@
 All rights reserved.
 
 This software was developed for the FreeBSD Project by ThinkSec AS and
-NAI Labs, the Security Research Division of Network Associates, Inc.
-under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
-DARPA CHATS research program.
+Network Associates Laboratories, the Security Research Division of
+Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
+("CBOSS"), as part of the DARPA CHATS research program.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -31,4 +31,4 @@
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 
-$P4: //depot/projects/openpam/LICENSE#4 $
+$P4: //depot/projects/openpam/LICENSE#5 $

==== //depot/projects/openpam/Makefile#7 (text+ko) ====

@@ -2,10 +2,11 @@
 # Copyright (c) 2002 Networks Associates Technology, Inc.
 # All rights reserved.
 #
-# This software was developed for the FreeBSD Project by ThinkSec AS and
-# NAI Labs, the Security Research Division of Network Associates, Inc.
-# under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
-# DARPA CHATS research program.
+# This software was developed for the FreeBSD Project by ThinkSec AS
+# and Network Associates Laboratories, the Security Research Division
+# of Network Associates, Inc.  under DARPA/SPAWAR contract
+# N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS research
+# program.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -31,7 +32,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $P4: //depot/projects/openpam/Makefile#6 $
+# $P4: //depot/projects/openpam/Makefile#7 $
 #
 
 SUBDIR		 =

==== //depot/projects/openpam/bin/Makefile#6 (text+ko) ====

@@ -2,10 +2,11 @@
 # Copyright (c) 2002 Networks Associates Technology, Inc.
 # All rights reserved.
 #
-# This software was developed for the FreeBSD Project by ThinkSec AS and
-# NAI Labs, the Security Research Division of Network Associates, Inc.
-# under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
-# DARPA CHATS research program.
+# This software was developed for the FreeBSD Project by ThinkSec AS
+# and Network Associates Laboratories, the Security Research Division
+# of Network Associates, Inc.  under DARPA/SPAWAR contract
+# N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS research
+# program.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -31,7 +32,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $P4: //depot/projects/openpam/bin/Makefile#5 $
+# $P4: //depot/projects/openpam/bin/Makefile#6 $
 #
 
 SUBDIR		 =

==== //depot/projects/openpam/bin/su/Makefile#5 (text+ko) ====

@@ -2,10 +2,11 @@
 # Copyright (c) 2002 Networks Associates Technology, Inc.
 # All rights reserved.
 #
-# This software was developed for the FreeBSD Project by ThinkSec AS and
-# NAI Labs, the Security Research Division of Network Associates, Inc.
-# under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
-# DARPA CHATS research program.
+# This software was developed for the FreeBSD Project by ThinkSec AS
+# and Network Associates Laboratories, the Security Research Division
+# of Network Associates, Inc.  under DARPA/SPAWAR contract
+# N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS research
+# program.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -31,7 +32,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $P4: //depot/projects/openpam/bin/su/Makefile#4 $
+# $P4: //depot/projects/openpam/bin/su/Makefile#5 $
 #
 
 PROG		 = su

==== //depot/projects/openpam/bin/su/su.c#8 (text+ko) ====

@@ -3,9 +3,9 @@
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
- * NAI Labs, the Security Research Division of Network Associates, Inc.
- * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
- * DARPA CHATS research program.
+ * Network Associates Laboratories, the Security Research Division of
+ * Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
+ * ("CBOSS"), as part of the DARPA CHATS research program.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/bin/su/su.c#7 $
+ * $P4: //depot/projects/openpam/bin/su/su.c#8 $
  */
 
 #include <sys/param.h>

==== //depot/projects/openpam/doc/Makefile#4 (text+ko) ====

@@ -2,10 +2,11 @@
 # Copyright (c) 2002 Networks Associates Technology, Inc.
 # All rights reserved.
 #
-# This software was developed for the FreeBSD Project by ThinkSec AS and
-# NAI Labs, the Security Research Division of Network Associates, Inc.
-# under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
-# DARPA CHATS research program.
+# This software was developed for the FreeBSD Project by ThinkSec AS
+# and Network Associates Laboratories, the Security Research Division
+# of Network Associates, Inc.  under DARPA/SPAWAR contract
+# N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS research
+# program.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -31,7 +32,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $P4: //depot/projects/openpam/doc/Makefile#3 $
+# $P4: //depot/projects/openpam/doc/Makefile#4 $
 #
 
 SUBDIR		 =

==== //depot/projects/openpam/doc/man/Makefile#11 (text+ko) ====

@@ -2,10 +2,11 @@
 # Copyright (c) 2002 Networks Associates Technology, Inc.
 # All rights reserved.
 #
-# This software was developed for the FreeBSD Project by ThinkSec AS and
-# NAI Labs, the Security Research Division of Network Associates, Inc.
-# under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
-# DARPA CHATS research program.
+# This software was developed for the FreeBSD Project by ThinkSec AS
+# and Network Associates Laboratories, the Security Research Division
+# of Network Associates, Inc.  under DARPA/SPAWAR contract
+# N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS research
+# program.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -31,7 +32,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $P4: //depot/projects/openpam/doc/man/Makefile#10 $
+# $P4: //depot/projects/openpam/doc/man/Makefile#11 $
 #
 
 GENDOC		 = ${.CURDIR}/../../misc/gendoc.pl

==== //depot/projects/openpam/doc/man/pam_conv.3#2 (text+ko) ====

@@ -3,9 +3,9 @@
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
-.\" NAI Labs, the Security Research Division of Network Associates, Inc.
-.\" under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
-.\" DARPA CHATS research program.
+.\" Network Associates Laboratories, the Security Research Division of
+.\" Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
+.\" ("CBOSS"), as part of the DARPA CHATS research program.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/openpam/doc/man/pam_conv.3#1 $
+.\" $P4: //depot/projects/openpam/doc/man/pam_conv.3#2 $
 .\"
 .Dd May 27, 2002
 .Dt PAM_CONV 3
@@ -45,25 +45,25 @@
 .In security/pam_appl.h
 .Bd -literal
 struct pam_message {
-        int      msg_style;
-        char    *msg;
+	int      msg_style;
+	char    *msg;
 };
 
 struct pam_response {
-        char    *resp;
-        int      resp_retcode;
+	char    *resp;
+	int      resp_retcode;
 };
 
 struct pam_conv {
-        int     (*conv)(int, const struct pam_message **,
-            struct pam_response **, void *);
-        void    *appdata_ptr;
+	int     (*conv)(int, const struct pam_message **,
+	    struct pam_response **, void *);
+	void    *appdata_ptr;
 };
 .Ed
 .Sh DESCRIPTION
 The PAM library uses an application-defined callback to communicate
-with the user.  
-This callback is specified by the 
+with the user.
+This callback is specified by the
 .Vt struct pam_conv
 passed to
 .Fn pam_start
@@ -76,7 +76,7 @@
 The conversation function's first argument specifies the number of
 messages (up to
 .Dv PAM_NUM_MSG )
-to process.  
+to process.
 The second argument is a pointer to a contiguous array of
 .Vt struct pam_message
 containing the actual messages.
@@ -111,7 +111,7 @@
 On success, the conversation function should allocate and fill a
 contiguous array of
 .Vt struct pam_response ,
-one for each message that was passed in.  
+one for each message that was passed in.
 A pointer to the user's response to each message (or
 .Dv NULL
 in the case of informational or error messages) should be stored in
@@ -125,7 +125,7 @@
 .Pp
 The
 .Va resp_retcode
-member of 
+member of
 .Vt struct pam_response
 is unused and should be set to zero.
 .Pp
@@ -137,7 +137,7 @@
 It is the conversation function's responsibility to ensure that it is
 legal to do so.
 .Pp
-The 
+The
 .Va appdata_ptr
 member of
 .Vt struct pam_conv
@@ -175,8 +175,8 @@
 .Re
 .Sh AUTHORS
 The OpenPAM library and this manual page were developed for the
-FreeBSD Project by ThinkSec AS and NAI Labs, the Security Research
-Division of Network Associates, Inc. under DARPA/SPAWAR contract
-N66001-01-C-8035
+FreeBSD Project by ThinkSec AS and Network Associates Laboratories,
+the Security Research Division of Network Associates, Inc. under
+DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.

==== //depot/projects/openpam/include/security/openpam.h#21 (text+ko) ====

@@ -3,9 +3,9 @@
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
- * NAI Labs, the Security Research Division of Network Associates, Inc.
- * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
- * DARPA CHATS research program.
+ * Network Associates Laboratories, the Security Research Division of
+ * Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
+ * ("CBOSS"), as part of the DARPA CHATS research program.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/include/security/openpam.h#20 $
+ * $P4: //depot/projects/openpam/include/security/openpam.h#21 $
  */
 
 #ifndef _SECURITY_OPENPAM_H_INCLUDED

==== //depot/projects/openpam/include/security/openpam_version.h#5 (text+ko) ====

@@ -3,9 +3,9 @@
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
- * NAI Labs, the Security Research Division of Network Associates, Inc.
- * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
- * DARPA CHATS research program.
+ * Network Associates Laboratories, the Security Research Division of
+ * Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
+ * ("CBOSS"), as part of the DARPA CHATS research program.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/include/security/openpam_version.h#4 $
+ * $P4: //depot/projects/openpam/include/security/openpam_version.h#5 $
  */
 
 #ifndef _OPENPAM_VERSION_H_INCLUDED

==== //depot/projects/openpam/include/security/pam_appl.h#10 (text+ko) ====

@@ -3,9 +3,9 @@
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
- * NAI Labs, the Security Research Division of Network Associates, Inc.
- * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
- * DARPA CHATS research program.
+ * Network Associates Laboratories, the Security Research Division of
+ * Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
+ * ("CBOSS"), as part of the DARPA CHATS research program.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/include/security/pam_appl.h#9 $
+ * $P4: //depot/projects/openpam/include/security/pam_appl.h#10 $
  */
 
 #ifndef _PAM_APPL_H_INCLUDED

==== //depot/projects/openpam/include/security/pam_constants.h#15 (text+ko) ====

@@ -3,9 +3,9 @@
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
- * NAI Labs, the Security Research Division of Network Associates, Inc.
- * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
- * DARPA CHATS research program.
+ * Network Associates Laboratories, the Security Research Division of
+ * Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
+ * ("CBOSS"), as part of the DARPA CHATS research program.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/include/security/pam_constants.h#14 $
+ * $P4: //depot/projects/openpam/include/security/pam_constants.h#15 $
  */
 
 #ifndef _PAM_CONSTANTS_H_INCLUDED

==== //depot/projects/openpam/include/security/pam_modules.h#8 (text+ko) ====

@@ -3,9 +3,9 @@
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
- * NAI Labs, the Security Research Division of Network Associates, Inc.
- * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
- * DARPA CHATS research program.
+ * Network Associates Laboratories, the Security Research Division of
+ * Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
+ * ("CBOSS"), as part of the DARPA CHATS research program.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/include/security/pam_modules.h#7 $
+ * $P4: //depot/projects/openpam/include/security/pam_modules.h#8 $
  */
 
 #ifndef _PAM_MODULES_H_INCLUDED

==== //depot/projects/openpam/include/security/pam_types.h#6 (text+ko) ====

@@ -3,9 +3,9 @@
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
- * NAI Labs, the Security Research Division of Network Associates, Inc.
- * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
- * DARPA CHATS research program.
+ * Network Associates Laboratories, the Security Research Division of
+ * Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
+ * ("CBOSS"), as part of the DARPA CHATS research program.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/include/security/pam_types.h#5 $
+ * $P4: //depot/projects/openpam/include/security/pam_types.h#6 $
  */
 
 #ifndef _PAM_TYPES_H_INCLUDED

==== //depot/projects/openpam/lib/Makefile#16 (text+ko) ====

@@ -3,9 +3,9 @@
 # All rights reserved.
 #
 # This software was developed for the FreeBSD Project by ThinkSec AS and
-# NAI Labs, the Security Research Division of Network Associates, Inc.
-# under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
-# DARPA CHATS research program.
+# Network Associates Laboratories, the Security Research Division of
+# Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
+# ("CBOSS"), as part of the DARPA CHATS research program.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -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/Makefile#15 $
+# $P4: //depot/projects/openpam/lib/Makefile#16 $
 #
 
 LIB		 = pam

==== //depot/projects/openpam/lib/openpam_borrow_cred.c#2 (text+ko) ====

@@ -3,9 +3,9 @@
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
- * NAI Labs, the Security Research Division of Network Associates, Inc.
- * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
- * DARPA CHATS research program.
+ * Network Associates Laboratories, the Security Research Division of
+ * Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
+ * ("CBOSS"), as part of the DARPA CHATS research program.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -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_borrow_cred.c#1 $
+ * $P4: //depot/projects/openpam/lib/openpam_borrow_cred.c#2 $
  */
 
 #include <sys/param.h>

==== //depot/projects/openpam/lib/openpam_configure.c#4 (text+ko) ====

@@ -3,9 +3,9 @@
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
- * NAI Labs, the Security Research Division of Network Associates, Inc.
- * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
- * DARPA CHATS research program.
+ * Network Associates Laboratories, the Security Research Division of
+ * Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
+ * ("CBOSS"), as part of the DARPA CHATS research program.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -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_configure.c#3 $
+ * $P4: //depot/projects/openpam/lib/openpam_configure.c#4 $
  */
 
 #include <ctype.h>

==== //depot/projects/openpam/lib/openpam_dispatch.c#15 (text+ko) ====

@@ -3,9 +3,9 @@
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
- * NAI Labs, the Security Research Division of Network Associates, Inc.
- * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
- * DARPA CHATS research program.
+ * Network Associates Laboratories, the Security Research Division of
+ * Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
+ * ("CBOSS"), as part of the DARPA CHATS research program.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -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_dispatch.c#14 $
+ * $P4: //depot/projects/openpam/lib/openpam_dispatch.c#15 $
  */
 
 #include <sys/param.h>

==== //depot/projects/openpam/lib/openpam_dynamic.c#6 (text+ko) ====

@@ -3,9 +3,9 @@
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
- * NAI Labs, the Security Research Division of Network Associates, Inc.
- * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
- * DARPA CHATS research program.
+ * Network Associates Laboratories, the Security Research Division of
+ * Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
+ * ("CBOSS"), as part of the DARPA CHATS research program.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -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#5 $
+ * $P4: //depot/projects/openpam/lib/openpam_dynamic.c#6 $
  */
 
 #include <dlfcn.h>

==== //depot/projects/openpam/lib/openpam_findenv.c#8 (text+ko) ====

@@ -3,9 +3,9 @@
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
- * NAI Labs, the Security Research Division of Network Associates, Inc.
- * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
- * DARPA CHATS research program.
+ * Network Associates Laboratories, the Security Research Division of
+ * Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
+ * ("CBOSS"), as part of the DARPA CHATS research program.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -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_findenv.c#7 $
+ * $P4: //depot/projects/openpam/lib/openpam_findenv.c#8 $
  */
 
 #include <string.h>

==== //depot/projects/openpam/lib/openpam_free_data.c#2 (text+ko) ====

@@ -3,9 +3,9 @@
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
- * NAI Labs, the Security Research Division of Network Associates, Inc.
- * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
- * DARPA CHATS research program.
+ * Network Associates Laboratories, the Security Research Division of
+ * Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
+ * ("CBOSS"), as part of the DARPA CHATS research program.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -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_free_data.c#1 $
+ * $P4: //depot/projects/openpam/lib/openpam_free_data.c#2 $
  */
 
 #include <stdlib.h>

==== //depot/projects/openpam/lib/openpam_get_option.c#4 (text+ko) ====

@@ -3,9 +3,9 @@
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
- * NAI Labs, the Security Research Division of Network Associates, Inc.
- * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
- * DARPA CHATS research program.
+ * Network Associates Laboratories, the Security Research Division of
+ * Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
+ * ("CBOSS"), as part of the DARPA CHATS research program.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -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_get_option.c#3 $
+ * $P4: //depot/projects/openpam/lib/openpam_get_option.c#4 $
  */
 
 #include <sys/param.h>

==== //depot/projects/openpam/lib/openpam_impl.h#15 (text+ko) ====

@@ -3,9 +3,9 @@
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
- * NAI Labs, the Security Research Division of Network Associates, Inc.
- * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
- * DARPA CHATS research program.
+ * Network Associates Laboratories, the Security Research Division of
+ * Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
+ * ("CBOSS"), as part of the DARPA CHATS research program.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -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_impl.h#14 $
+ * $P4: //depot/projects/openpam/lib/openpam_impl.h#15 $
  */
 
 #ifndef _OPENPAM_IMPL_H_INCLUDED

==== //depot/projects/openpam/lib/openpam_load.c#14 (text+ko) ====

@@ -3,9 +3,9 @@
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
- * NAI Labs, the Security Research Division of Network Associates, Inc.
- * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
- * DARPA CHATS research program.
+ * Network Associates Laboratories, the Security Research Division of
+ * Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
+ * ("CBOSS"), as part of the DARPA CHATS research program.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -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#13 $
+ * $P4: //depot/projects/openpam/lib/openpam_load.c#14 $
  */
 
 #include <dlfcn.h>

==== //depot/projects/openpam/lib/openpam_log.c#15 (text+ko) ====

@@ -3,9 +3,9 @@
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
- * NAI Labs, the Security Research Division of Network Associates, Inc.
- * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
- * DARPA CHATS research program.
+ * Network Associates Laboratories, the Security Research Division of
+ * Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
+ * ("CBOSS"), as part of the DARPA CHATS research program.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -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_log.c#14 $
+ * $P4: //depot/projects/openpam/lib/openpam_log.c#15 $
  */
 
 #include <ctype.h>

==== //depot/projects/openpam/lib/openpam_nullconv.c#3 (text+ko) ====

@@ -3,9 +3,9 @@
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
- * NAI Labs, the Security Research Division of Network Associates, Inc.
- * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
- * DARPA CHATS research program.
+ * Network Associates Laboratories, the Security Research Division of
+ * Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
+ * ("CBOSS"), as part of the DARPA CHATS research program.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -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_nullconv.c#2 $
+ * $P4: //depot/projects/openpam/lib/openpam_nullconv.c#3 $
  */
 
 #include <sys/types.h>

==== //depot/projects/openpam/lib/openpam_restore_cred.c#2 (text+ko) ====

@@ -3,9 +3,9 @@
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
- * NAI Labs, the Security Research Division of Network Associates, Inc.
- * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
- * DARPA CHATS research program.
+ * Network Associates Laboratories, the Security Research Division of
+ * Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
+ * ("CBOSS"), as part of the DARPA CHATS research program.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -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_restore_cred.c#1 $
+ * $P4: //depot/projects/openpam/lib/openpam_restore_cred.c#2 $
  */
 
 #include <sys/param.h>

==== //depot/projects/openpam/lib/openpam_set_option.c#5 (text+ko) ====

@@ -3,9 +3,9 @@
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
- * NAI Labs, the Security Research Division of Network Associates, Inc.
- * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
- * DARPA CHATS research program.
+ * Network Associates Laboratories, the Security Research Division of
+ * Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
+ * ("CBOSS"), as part of the DARPA CHATS research program.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -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_set_option.c#4 $
+ * $P4: //depot/projects/openpam/lib/openpam_set_option.c#5 $
  */
 
 #include <sys/param.h>

==== //depot/projects/openpam/lib/openpam_static.c#5 (text+ko) ====

@@ -3,9 +3,9 @@
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
- * NAI Labs, the Security Research Division of Network Associates, Inc.
- * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
- * DARPA CHATS research program.
+ * Network Associates Laboratories, the Security Research Division of
+ * Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
+ * ("CBOSS"), as part of the DARPA CHATS research program.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -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_static.c#4 $
+ * $P4: //depot/projects/openpam/lib/openpam_static.c#5 $
  */
 
 #include <string.h>

==== //depot/projects/openpam/lib/openpam_ttyconv.c#12 (text+ko) ====

@@ -3,9 +3,9 @@
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
- * NAI Labs, the Security Research Division of Network Associates, Inc.
- * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
- * DARPA CHATS research program.
+ * Network Associates Laboratories, the Security Research Division of
+ * Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
+ * ("CBOSS"), as part of the DARPA CHATS research program.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -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#11 $
+ * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#12 $
  */
 
 #include <sys/types.h>

==== //depot/projects/openpam/lib/pam_acct_mgmt.c#9 (text+ko) ====

@@ -3,9 +3,9 @@
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
- * NAI Labs, the Security Research Division of Network Associates, Inc.
- * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
- * DARPA CHATS research program.
+ * Network Associates Laboratories, the Security Research Division of
+ * Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
+ * ("CBOSS"), as part of the DARPA CHATS research program.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -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/pam_acct_mgmt.c#8 $
+ * $P4: //depot/projects/openpam/lib/pam_acct_mgmt.c#9 $
  */
 
 #include <sys/param.h>

==== //depot/projects/openpam/lib/pam_authenticate.c#11 (text+ko) ====

@@ -3,9 +3,9 @@
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
- * NAI Labs, the Security Research Division of Network Associates, Inc.
- * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
- * DARPA CHATS research program.
+ * Network Associates Laboratories, the Security Research Division of
+ * Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
+ * ("CBOSS"), as part of the DARPA CHATS research program.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

>>> TRUNCATED FOR MAIL (1000 lines) <<<

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200206071623.g57GNCX40963>