Adjust most C source files to match the new standards for copyright

and license comments.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24695 dc483132-0cff-0310-8789-dd5450dbe970

36 files changed, 76 insertions, 125 deletions

diff --git a/src/include/CredentialsCache.h b/src/include/CredentialsCache.h
index 75c4ce7642..54f71a1a02 100644
--- a/src/include/CredentialsCache.h
+++ b/src/include/CredentialsCache.h
@@ -1,7 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* include/CredentialsCache.h */
 /*
- * $Header$
- *
  * Copyright 1998-2006 Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
diff --git a/src/include/CredentialsCache2.h b/src/include/CredentialsCache2.h
index 687ff43016..b3b48996d8 100644
--- a/src/include/CredentialsCache2.h
+++ b/src/include/CredentialsCache2.h
@@ -1,7 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* include/CredentialsCache2.h */
 /*
- * $Header$
- *
  * Copyright 2006 Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
diff --git a/src/include/adm.h b/src/include/adm.h
index c23cd89e34..9c75b156a4 100644
--- a/src/include/adm.h
+++ b/src/include/adm.h
@@ -1,7 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* include/adm.h */
 /*
- * include/krb5/adm.h
- *
  * Copyright 1995,2001,2009 by the Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
@@ -23,8 +22,8 @@
  * M.I.T. makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
- *
  */
+
 #ifndef KRB5_ADM_H__
 #define KRB5_ADM_H__
 
diff --git a/src/include/adm_proto.h b/src/include/adm_proto.h
index 9cdd22c678..c6d1425ba2 100644
--- a/src/include/adm_proto.h
+++ b/src/include/adm_proto.h
@@ -1,7 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* include/adm_proto.h */
 /*
- * include/krb5/adm_proto.h
- *
  * Copyright 1995, 2007,2008,2009 by the Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
@@ -23,8 +22,8 @@
  * M.I.T. makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
- *
  */
+
 #ifndef KRB5_ADM_PROTO_H__
 #define KRB5_ADM_PROTO_H__
 
diff --git a/src/include/cm.h b/src/include/cm.h
index 2bb5ca9805..734f69ec74 100644
--- a/src/include/cm.h
+++ b/src/include/cm.h
@@ -1,7 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* include/cm.h */
 /*
- * include/cm.h
- *
  * Copyright 2002 by the Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
diff --git a/src/include/foreachaddr.h b/src/include/foreachaddr.h
index c46d47195a..9ed35eab9e 100644
--- a/src/include/foreachaddr.h
+++ b/src/include/foreachaddr.h
@@ -1,7 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* include/foreachaddr.h */
 /*
- * include/foreachaddr.c
- *
  * Copyright 1990,1991,2000,2001,2002,2004 by the Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
@@ -23,7 +22,9 @@
  * M.I.T. makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
- *
+ */
+
+/*
  *
  * Iterate over the protocol addresses supported by this host, invoking
  * a callback function or three supplied by the caller.
diff --git a/src/include/gssrpc/auth_gss.h b/src/include/gssrpc/auth_gss.h
index c850b03bb7..9fa87742fe 100644
--- a/src/include/gssrpc/auth_gss.h
+++ b/src/include/gssrpc/auth_gss.h
@@ -1,6 +1,5 @@
+/* include/gssrpc/auth_gss.h */
 /*
-  auth_gssapi.h
-
   Copyright (c) 2000 The Regents of the University of Michigan.
   All rights reserved.
 
diff --git a/src/include/gssrpc/auth_gssapi.h b/src/include/gssrpc/auth_gssapi.h
index cd405d4072..d842930bb0 100644
--- a/src/include/gssrpc/auth_gssapi.h
+++ b/src/include/gssrpc/auth_gssapi.h
@@ -1,10 +1,6 @@
+/* include/gssrpc/auth_gssapi.h - GSS-API style auth parameters for RPC */
 /*
- * auth_gssapi.h, Protocol for GSS-API style authentication parameters for RPC
- *
  * Copyright 1993 OpenVision Technologies, Inc., All Rights Reserved.
- *
- * $Id$
- *
  */
 
 #ifndef GSSRPC_AUTH_GSSAPI_H
diff --git a/src/include/gssrpc/netdb.h b/src/include/gssrpc/netdb.h
index d02f8c17b3..f933fbb7b4 100644
--- a/src/include/gssrpc/netdb.h
+++ b/src/include/gssrpc/netdb.h
@@ -1,7 +1,4 @@
-#ifndef RPC_NETDB_H
-#define RPC_NETDB_H
-
-/* @(#)netdb.h	2.1 88/07/29 3.9 RPCSRC */
+/* include/gssrpc/netdb.h */
 /*
  * Copyright (c) 2010, Oracle America, Inc.
  *
@@ -34,7 +31,13 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+/* @(#)netdb.h	2.1 88/07/29 3.9 RPCSRC */
 /*	@(#)rpc.h 1.8 87/07/24 SMI	*/
+
+#ifndef RPC_NETDB_H
+#define RPC_NETDB_H
+
 #include <gssrpc/types.h>
 /* since the gssrpc library requires that any application using it be
 built with these header files, I am making the decision that any app
diff --git a/src/include/gssrpc/rename.h b/src/include/gssrpc/rename.h
index a4da2cdfba..318be1a52d 100644
--- a/src/include/gssrpc/rename.h
+++ b/src/include/gssrpc/rename.h
@@ -1,6 +1,5 @@
+/* include/gssrpc/rename.h */
 /*
- * lib/rpc/rename.h
- *
  * Copyright (C) 2004 by the Massachusetts Institute of Technology.
  * All rights reserved.
  *
@@ -22,7 +21,9 @@
  * M.I.T. makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
- *
+ */
+
+/*
  *
  * Namespace mangling for various purposes.
  *
diff --git a/src/include/k5-buf.h b/src/include/k5-buf.h
index ccd6bd3ab7..621d7d3cb7 100644
--- a/src/include/k5-buf.h
+++ b/src/include/k5-buf.h
@@ -1,7 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* include/k5-buf.h - k5buf interface declarations */
 /*
- * include/k5-buf.h
- *
  * Copyright 2008 Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
@@ -23,9 +22,6 @@
  * M.I.T. makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
- *
- *
- * k5buf string buffer module interface
  */
 
 #ifndef K5_BUF_H
diff --git a/src/include/k5-err.h b/src/include/k5-err.h
index 7014002c86..483c5cd37d 100644
--- a/src/include/k5-err.h
+++ b/src/include/k5-err.h
@@ -1,7 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* include/k5-err.h */
 /*
- * include/k5-err.h
- *
  * Copyright 2006, 2007 Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
@@ -23,7 +22,9 @@
  * M.I.T. makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
- *
+ */
+
+/*
  *
  * Error-message handling
  */
diff --git a/src/include/k5-gmt_mktime.h b/src/include/k5-gmt_mktime.h
index 11cb9dd8d5..795e46ce5e 100644
--- a/src/include/k5-gmt_mktime.h
+++ b/src/include/k5-gmt_mktime.h
@@ -1,7 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* include/k5-gmt_mktime.h */
 /*
- * include/k5-gmt_mktime.h
- *
  * Copyright 2008 Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
@@ -23,7 +22,9 @@
  * M.I.T. makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
- *
+ */
+
+/*
  *
  * GMT struct tm conversion
  *
diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index 830abd5e04..85cd71763e 100644
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -1,6 +1,7 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- * Copyright (C) 1989,1990,1991,1992,1993,1994,1995,2000,2001, 2003,2006,2007,2008,2009 by the Massachusetts Institute of Technology,
+ * Copyright (C) 1989,1990,1991,1992,1993,1994,1995,2000,2001,
+ * 2003,2006,2007,2008,2009 by the Massachusetts Institute of Technology,
  * Cambridge, MA, USA.  All Rights Reserved.
  *
  * This software is being provided to you, the LICENSEE, by the
@@ -39,7 +40,6 @@
  * your software as modified software and not distribute it in such a
  * fashion that it might be confused with the original M.I.T. software.
  */
-
 /*
  * Copyright (C) 1998 by the FundsXpress, INC.
  *
@@ -797,7 +797,6 @@ error(MIT_DES_KEYSIZE does not equal KRB5_MIT_DES_KEYSIZE)
  * Sandia National Laboratories also makes no representations about the
  * suitability of the modifications, or additions to this software for
  * any purpose.  It is provided "as is" without express or implied warranty.
- *
  */
 #ifndef KRB5_PREAUTH__
 #define KRB5_PREAUTH__
diff --git a/src/include/k5-ipc_stream.h b/src/include/k5-ipc_stream.h
index c1a36e6b53..11f8bc7678 100644
--- a/src/include/k5-ipc_stream.h
+++ b/src/include/k5-ipc_stream.h
@@ -1,7 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* include/k5-ipc_stream.h */
 /*
- * $Header$
- *
  * Copyright 2006 Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
diff --git a/src/include/k5-platform.h b/src/include/k5-platform.h
index e656b52c86..dd776e7ecc 100644
--- a/src/include/k5-platform.h
+++ b/src/include/k5-platform.h
@@ -1,7 +1,6 @@
 /* -*- mode: c; indent-tabs-mode: nil -*- */
+/* include/k5-platform.h */
 /*
- * k5-platform.h
- *
  * Copyright 2003, 2004, 2005, 2007, 2008, 2009 Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
@@ -23,8 +22,9 @@
  * M.I.T. makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
- *
- *
+ */
+
+/*
  * Some platform-dependent definitions to sync up the C support level.
  * Some to a C99-ish level, some related utility code.
  *
diff --git a/src/include/k5-thread.h b/src/include/k5-thread.h
index 5f0325c5e7..0c90b55e9b 100644
--- a/src/include/k5-thread.h
+++ b/src/include/k5-thread.h
@@ -1,7 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* include/k5-thread.h - Preliminary portable thread support */
 /*
- * include/k5-thread.h
- *
  * Copyright 2004,2005,2006,2007,2008 by the Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
@@ -23,9 +22,6 @@
  * M.I.T. makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
- *
- *
- * Preliminary thread support.
  */
 
 #ifndef K5_THREAD_H
diff --git a/src/include/k5-trace.h b/src/include/k5-trace.h
index 96a6acf5fd..a9f75738a8 100644
--- a/src/include/k5-trace.h
+++ b/src/include/k5-trace.h
@@ -1,7 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* include/k5-trace.h */
 /*
- * include/k5-trace.h
- *
  * Copyright (C) 2010 by the Massachusetts Institute of Technology.
  * All rights reserved.
  *
@@ -23,8 +22,9 @@
  * M.I.T. makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
- *
- *
+ */
+
+/*
  * This header contains trace macro definitions, which map trace points within
  * the code to krb5int_trace() calls with descriptive text strings.
  *
diff --git a/src/include/k5-unicode.h b/src/include/k5-unicode.h
index d643734632..1c5ceb89e2 100644
--- a/src/include/k5-unicode.h
+++ b/src/include/k5-unicode.h
@@ -39,8 +39,7 @@
  * your software as modified software and not distribute it in such a
  * fashion that it might be confused with the original M.I.T. software.
  */
-/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
- *
+/*
  * Copyright 1998-2008 The OpenLDAP Foundation.
  * All rights reserved.
  *
@@ -52,9 +51,7 @@
  * top-level directory of the distribution or, alternatively, at
  * <http://www.OpenLDAP.org/license.html>.
  */
-/* This notice applies to changes, created by or for Novell, Inc.,
- * to preexisting works for which notices appear elsewhere in this file.
- *
+/*
  * Copyright (C) 2000 Novell, Inc. All Rights Reserved.
  *
  * THIS WORK IS SUBJECT TO U.S. AND INTERNATIONAL COPYRIGHT LAWS AND TREATIES.
@@ -67,6 +64,8 @@
  * PERPETRATOR TO CRIMINAL AND CIVIL LIABILITY.
  */
 
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>. */
+
 #ifndef K5_UNICODE_H
 #define K5_UNICODE_H
 
diff --git a/src/include/k5-utf8.h b/src/include/k5-utf8.h
index ac54147e75..a4b6375ebb 100644
--- a/src/include/k5-utf8.h
+++ b/src/include/k5-utf8.h
@@ -39,8 +39,7 @@
  * your software as modified software and not distribute it in such a
  * fashion that it might be confused with the original M.I.T. software.
  */
-/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
- *
+/*
  * Copyright 1998-2008 The OpenLDAP Foundation.
  * All rights reserved.
  *
@@ -52,9 +51,7 @@
  * top-level directory of the distribution or, alternatively, at
  * <http://www.OpenLDAP.org/license.html>.
  */
-/* This notice applies to changes, created by or for Novell, Inc.,
- * to preexisting works for which notices appear elsewhere in this file.
- *
+/*
  * Copyright (C) 2000 Novell, Inc. All Rights Reserved.
  *
  * THIS WORK IS SUBJECT TO U.S. AND INTERNATIONAL COPYRIGHT LAWS AND TREATIES.
@@ -66,6 +63,7 @@
  * LICENSE, OR OTHER PRIOR WRITTEN CONSENT FROM NOVELL, COULD SUBJECT THE
  * PERPETRATOR TO CRIMINAL AND CIVIL LIABILITY.
  */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>. */
 
 #ifndef K5_UTF8_H
 #define K5_UTF8_H
diff --git a/src/include/kdb.h b/src/include/kdb.h
index ed1961ea25..20ca78a3a9 100644
--- a/src/include/kdb.h
+++ b/src/include/kdb.h
@@ -1,7 +1,5 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- * include/krb5/kdb.h
- *
  * Copyright 1990,1991 by the Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
@@ -23,11 +21,7 @@
  * M.I.T. makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
- *
- *
- * KDC Database interface definitions.
  */
-
 /*
  * Copyright (C) 1998 by the FundsXpress, INC.
  *
@@ -53,12 +47,13 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
-
 /*
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
+/* KDC Database interface definitions */
+
 /* This API is not considered as stable as the main krb5 API.
  *
  * - We may make arbitrary incompatible changes between feature
diff --git a/src/include/kdb_kt.h b/src/include/kdb_kt.h
index b9063796f8..6a71c3c109 100644
--- a/src/include/kdb_kt.h
+++ b/src/include/kdb_kt.h
@@ -1,7 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* include/kdb_kt.h - KDC keytab declarations */
 /*
- * include/krb5/kdb_kt.h
- *
  * Copyright 1997 by the Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
@@ -23,12 +22,8 @@
  * M.I.T. makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
- *
- *
- * KDC keytab definitions.
  */
 
-
 #ifndef KRB5_KDB5_KT_H
 #define KRB5_KDB5_KT_H
 
diff --git a/src/include/krb5/authdata_plugin.h b/src/include/krb5/authdata_plugin.h
index 32bff2f3b2..476105c74c 100644
--- a/src/include/krb5/authdata_plugin.h
+++ b/src/include/krb5/authdata_plugin.h
@@ -1,7 +1,5 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- * krb5/authdata_plugin.h
- *
  * Copyright (C) 2007 Apple Inc.  All Rights Reserved.
  *
  * Export of this software from the United States of America may
@@ -22,11 +20,10 @@
  * M.I.T. makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
- *
- * AuthorizationData plugin definitions for Kerberos 5.
  */
 
 /*
+ * Authorization data plugin definitions for Kerberos 5.
  * This is considered an INTERNAL interface at this time.
  *
  * Some work is needed before exporting it:
diff --git a/src/include/krb5/kadm5_hook_plugin.h b/src/include/krb5/kadm5_hook_plugin.h
index cca835338f..6a0aa45f2e 100644
--- a/src/include/krb5/kadm5_hook_plugin.h
+++ b/src/include/krb5/kadm5_hook_plugin.h
@@ -1,8 +1,5 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- * include/krb5/kadm5_hook_plugin.h
- */
-/*
  * Copyright (C) 2010 by the Massachusetts Institute of Technology.
  * All rights reserved.
  *
diff --git a/src/include/krb5/krb5.hin b/src/include/krb5/krb5.hin
index 713932b443..308e50f677 100644
--- a/src/include/krb5/krb5.hin
+++ b/src/include/krb5/krb5.hin
@@ -1,8 +1,7 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* include/krb5.h - General definitions for Kerberos version 5.
- *
- * Copyright 1989,1990,1995,2001, 2003, 2007, 2011 by the Massachusetts Institute of Technology.
- * All Rights Reserved.
+/*
+ * Copyright 1989,1990,1995,2001, 2003, 2007, 2011 by the Massachusetts
+ * Institute of Technology.  All Rights Reserved.
  *
  * Export of this software from the United States of America may
  *   require a specific license from the United States Government.
@@ -22,9 +21,7 @@
  * M.I.T. makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
- *
  */
-
 /*
  * Copyright (C) 1998 by the FundsXpress, INC.
  *
diff --git a/src/include/krb5/locate_plugin.h b/src/include/krb5/locate_plugin.h
index 3bdac348cd..d0e85494d7 100644
--- a/src/include/krb5/locate_plugin.h
+++ b/src/include/krb5/locate_plugin.h
@@ -1,7 +1,5 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- * <krb5/locate_plugin.h>
- *
  * Copyright 2006 Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
@@ -23,7 +21,9 @@
  * M.I.T. makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
- *
+ */
+
+/*
  *
  * Service location plugin definitions for Kerberos 5.
  */
diff --git a/src/include/krb5/plugin.h b/src/include/krb5/plugin.h
index f43406ab8e..c575efa0cf 100644
--- a/src/include/krb5/plugin.h
+++ b/src/include/krb5/plugin.h
@@ -1,7 +1,5 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- * <krb5/plugin.h>
- *
  * Copyright (C) 2010 by the Massachusetts Institute of Technology.
  * All rights reserved.
  *
@@ -23,11 +21,11 @@
  * M.I.T. makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
- *
- *
- * Generic declarations for dynamic modules implementing krb5 plugin modules.
  */
 
+/* Generic declarations for dynamic modules implementing krb5 plugin
+ * modules. */
+
 #ifndef KRB5_PLUGIN_H
 #define KRB5_PLUGIN_H
 
diff --git a/src/include/krb5/preauth_plugin.h b/src/include/krb5/preauth_plugin.h
index 0e7dac2256..21140cb45b 100644
--- a/src/include/krb5/preauth_plugin.h
+++ b/src/include/krb5/preauth_plugin.h
@@ -1,7 +1,5 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- * <krb5/preauth_plugin.h>
- *
  * Copyright (c) 2006 Red Hat, Inc.
  * Portions copyright (c) 2006 Massachusetts Institute of Technology
  * All Rights Reserved.
@@ -30,10 +28,10 @@
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Preauthentication plugin definitions for Kerberos 5.
  */
 
+/* Preauthentication plugin definitions for Kerberos 5 */
+
 #ifndef KRB5_PREAUTH_PLUGIN_H_INCLUDED
 #define KRB5_PREAUTH_PLUGIN_H_INCLUDED
 #include <krb5/krb5.h>
diff --git a/src/include/krb5/pwqual_plugin.h b/src/include/krb5/pwqual_plugin.h
index 110197a2a3..00e7df973e 100644
--- a/src/include/krb5/pwqual_plugin.h
+++ b/src/include/krb5/pwqual_plugin.h
@@ -1,7 +1,5 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- * prototype/prototype.h
- *
  * Copyright (C) 2010 by the Massachusetts Institute of Technology.
  * All rights reserved.
  *
@@ -23,8 +21,9 @@
  * M.I.T. makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
- *
- *
+ */
+
+/*
  * Declarations for password quality plugin module implementors.
  *
  * The password quality pluggable interface currently has only one supported
diff --git a/src/include/net-server.h b/src/include/net-server.h
index 105b006d86..6902abf10e 100644
--- a/src/include/net-server.h
+++ b/src/include/net-server.h
@@ -1,7 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* include/net-server.h */
 /*
- * include/net-server.h
- *
  * Copyright (C) 2010 by the Massachusetts Institute of Technology.
  * All rights reserved.
  *
@@ -23,11 +22,10 @@
  * M.I.T. makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
- *
- *
- * Declarations for "API" of network listener/dispatcher in libapputils.
  */
 
+/* Declarations for "API" of network listener/dispatcher in libapputils. */
+
 #ifndef NET_SERVER_H
 #define NET_SERVER_H
 
diff --git a/src/include/osconf.hin b/src/include/osconf.hin
index b39c97498f..073ce1422f 100644
--- a/src/include/osconf.hin
+++ b/src/include/osconf.hin
@@ -1,6 +1,5 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* include/krb5/stock/osconf.h
- *
+/*
  * Copyright 1990,1991,2008 by the Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
@@ -22,11 +21,10 @@
  * M.I.T. makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
- *
- *
- * Site- and OS- dependant configuration.
  */
 
+/* Site- and OS- dependent configuration */
+
 #ifndef KRB5_OSCONF__
 #define KRB5_OSCONF__
 
diff --git a/src/include/pkinit_apple_utils.h b/src/include/pkinit_apple_utils.h
index be6a930fc8..77ed9a0d9b 100644
--- a/src/include/pkinit_apple_utils.h
+++ b/src/include/pkinit_apple_utils.h
@@ -21,7 +21,6 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
  */
 
 /*
diff --git a/src/include/pkinit_asn1.h b/src/include/pkinit_asn1.h
index 44b01e9664..a1c4fe88ee 100644
--- a/src/include/pkinit_asn1.h
+++ b/src/include/pkinit_asn1.h
@@ -21,7 +21,6 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
  */
 
 /*
diff --git a/src/include/pkinit_cert_store.h b/src/include/pkinit_cert_store.h
index 1524f1c0cd..3bec81e373 100644
--- a/src/include/pkinit_cert_store.h
+++ b/src/include/pkinit_cert_store.h
@@ -21,7 +21,6 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
  */
 
 /*
diff --git a/src/include/pkinit_client.h b/src/include/pkinit_client.h
index d3182cc84b..ed8e6e4dac 100644
--- a/src/include/pkinit_client.h
+++ b/src/include/pkinit_client.h
@@ -21,7 +21,6 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
  */
 
 /*
diff --git a/src/include/pkinit_cms.h b/src/include/pkinit_cms.h
index d46358dd9d..832e00d5bf 100644
--- a/src/include/pkinit_cms.h
+++ b/src/include/pkinit_cms.h
@@ -21,7 +21,6 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
  */
 
 /*