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

26 files changed, 91 insertions, 121 deletions

diff --git a/src/util/et/com_err.h b/src/util/et/com_err.h
index 66004603b..0a631e981 100644
--- a/src/util/et/com_err.h
+++ b/src/util/et/com_err.h
@@ -1,6 +1,4 @@
 /*
- * Header file for common error description library.
- *
  * Copyright 1988, Student Information Processing Board of the
  * Massachusetts Institute of Technology.
  *
@@ -10,6 +8,8 @@
  * with this package.
  */
 
+/* Header file for common error description library. */
+
 #ifndef __COM_ERR_H
 
 #if defined(_WIN32)
diff --git a/src/util/et/compile_et.c b/src/util/et/compile_et.c
index 993b3ed87..47c563791 100644
--- a/src/util/et/compile_et.c
+++ b/src/util/et/compile_et.c
@@ -1,11 +1,14 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *
  * Copyright 1986, 1987, 1988
  * by MIT Student Information Processing Board.
  *
  * For copyright info, see "mit-sipb-copyright.h".
- *
+ */
+/*
+ * Copyright (c) 1987 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
  */
 
 #include <stdio.h>
@@ -287,11 +290,6 @@ int yyerror(s) char *s; {
 
 #ifdef NEED_STRCASECMP
 /* Need strcasecmp for this machine */
-/*
- * Copyright (c) 1987 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
- */
 
 /* based on @(#)strcasecmp.c    1.3 (Berkeley) 8/3/87 */
 
diff --git a/src/util/exitsleep.c b/src/util/exitsleep.c
index c0275265c..e4cc1afc2 100644
--- a/src/util/exitsleep.c
+++ b/src/util/exitsleep.c
@@ -1,7 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* util/exitsleep.c */
 /*
- * util/exitsleep.c
- *
  * Copyright (C) 2003 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.
- *
+ */
+
+/*
  * Kludge to sleep 100ms prior to exit on Solaris 9 to work around a
  * pty bug.
  */
diff --git a/src/util/mac/k5_mig_client.c b/src/util/mac/k5_mig_client.c
index 1891b31c9..da62153d9 100644
--- a/src/util/mac/k5_mig_client.c
+++ b/src/util/mac/k5_mig_client.c
@@ -1,7 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* util/mac/k5_mig_client.c */
 /*
- * $Header$
- *
  * Copyright 2006 Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
diff --git a/src/util/mac/k5_mig_client.h b/src/util/mac/k5_mig_client.h
index 3fa8591a8..1d13bdac1 100644
--- a/src/util/mac/k5_mig_client.h
+++ b/src/util/mac/k5_mig_client.h
@@ -1,7 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* util/mac/k5_mig_client.h */
 /*
- * $Header$
- *
  * Copyright 2006 Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
diff --git a/src/util/mac/k5_mig_server.c b/src/util/mac/k5_mig_server.c
index baea1654b..cdab13b53 100644
--- a/src/util/mac/k5_mig_server.c
+++ b/src/util/mac/k5_mig_server.c
@@ -1,7 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* util/mac/k5_mig_server.c */
 /*
- * $Header$
- *
  * Copyright 2006 Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
diff --git a/src/util/mac/k5_mig_server.h b/src/util/mac/k5_mig_server.h
index 9ee0fa10e..95a5d0aa9 100644
--- a/src/util/mac/k5_mig_server.h
+++ b/src/util/mac/k5_mig_server.h
@@ -1,7 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* util/mac/k5_mig_server.h */
 /*
- * $Header$
- *
  * Copyright 2006 Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
diff --git a/src/util/profile/argv_parse.c b/src/util/profile/argv_parse.c
index 5101281dd..aac1f4585 100644
--- a/src/util/profile/argv_parse.c
+++ b/src/util/profile/argv_parse.c
@@ -1,15 +1,5 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- * argv_parse.c --- utility function for parsing a string into a
- *      argc, argv array.
- *
- * This file defines a function argv_parse() which parsing a
- * passed-in string, handling double quotes and backslashes, and
- * creates an allocated argv vector which can be freed using the
- * argv_free() function.
- *
- * See argv_parse.h for the formal definition of the functions.
- *
  * Copyright 1999 by Theodore Ts'o.
  *
  * Permission to use, copy, modify, and distribute this software for
@@ -25,8 +15,20 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  (Isn't
  * it sick that the U.S. culture of lawsuit-happy lawyers requires
  * this kind of disclaimer?)
- *
+ */
+
+/*
  * Version 1.1, modified 2/27/1999
+ *
+ * argv_parse.c --- utility function for parsing a string into a
+ *      argc, argv array.
+ *
+ * This file defines a function argv_parse() which parsing a
+ * passed-in string, handling double quotes and backslashes, and
+ * creates an allocated argv vector which can be freed using the
+ * argv_free() function.
+ *
+ * See argv_parse.h for the formal definition of the functions.
  */
 
 #include "prof_int.h"
diff --git a/src/util/profile/argv_parse.h b/src/util/profile/argv_parse.h
index a84bdee79..26904ebea 100644
--- a/src/util/profile/argv_parse.h
+++ b/src/util/profile/argv_parse.h
@@ -1,5 +1,25 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
+ * Copyright 1999 by Theodore Ts'o.
+ *
+ * Permission to use, copy, modify, and distribute this software for
+ * any purpose with or without fee is hereby granted, provided that
+ * the above copyright notice and this permission notice appear in all
+ * copies.  THE SOFTWARE IS PROVIDED "AS IS" AND THEODORE TS'O (THE
+ * AUTHOR) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+ * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  (Isn't
+ * it sick that the U.S. culture of lawsuit-happy lawyers requires
+ * this kind of disclaimer?)
+ */
+
+/*
+ * Version 1.1, modified 2/27/1999
+ *
  * argv_parse.h --- header file for the argv parser.
  *
  * This file defines the interface for the functions argv_parse() and
@@ -20,24 +40,6 @@
  *
  * This function frees the argument vector created by argv_parse().
  ***********************************************************************
- *
- * Copyright 1999 by Theodore Ts'o.
- *
- * Permission to use, copy, modify, and distribute this software for
- * any purpose with or without fee is hereby granted, provided that
- * the above copyright notice and this permission notice appear in all
- * copies.  THE SOFTWARE IS PROVIDED "AS IS" AND THEODORE TS'O (THE
- * AUTHOR) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
- * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  (Isn't
- * it sick that the U.S. culture of lawsuit-happy lawyers requires
- * this kind of disclaimer?)
- *
- * Version 1.1, modified 2/27/1999
  */
 
 extern int argv_parse(char *in_buf, int *ret_argc, char ***ret_argv);
diff --git a/src/util/ss/listen.c b/src/util/ss/listen.c
index ce8e527a4..f7be47b13 100644
--- a/src/util/ss/listen.c
+++ b/src/util/ss/listen.c
@@ -1,9 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* util/ss/listen.c */
 /*
- * Listener loop for subsystem library libss.a.
- *
- *      util/ss/listen.c
- *
  * Copyright 1987, 1988 by MIT Student Information Processing Board
  *
  * For copyright information, see copyright.h.
diff --git a/src/util/ss/mk_cmds.c b/src/util/ss/mk_cmds.c
index 6488f7c2d..3ed37794d 100644
--- a/src/util/ss/mk_cmds.c
+++ b/src/util/ss/mk_cmds.c
@@ -1,9 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* util/ss/mk_cmds.c */
 /*
- * make_commands.c
- *
- * util/ss/mk_cmds.c
- *
  * Copyright 1987, 1988 by MIT Student Information Processing Board
  *
  * For copyright information, see copyright.h.
diff --git a/src/util/ss/pager.c b/src/util/ss/pager.c
index be8fd0bfe..ae023b594 100644
--- a/src/util/ss/pager.c
+++ b/src/util/ss/pager.c
@@ -1,8 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* util/ss/pager.c - create a "more" running out of a file descriptor */
 /*
- * Pager: Routines to create a "more" running out of a particular file
- * descriptor.
- *
  * Copyright 1987, 1988 by MIT Student Information Processing Board
  *
  * For copyright information, see copyright.h.
diff --git a/src/util/ss/prompt.c b/src/util/ss/prompt.c
index f42fde990..5aa2ad614 100644
--- a/src/util/ss/prompt.c
+++ b/src/util/ss/prompt.c
@@ -1,9 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* util/ss/prompt.c */
 /*
- * prompt.c: Routines for retrieving and setting a prompt.
- *
- * util/ss/prompt.c
- *
  * Copyright 1987, 1988 by MIT Student Information Processing Board
  *
  * For copyright information, see copyright.h.
diff --git a/src/util/ss/requests.c b/src/util/ss/requests.c
index 27c4a2084..3e62f970c 100644
--- a/src/util/ss/requests.c
+++ b/src/util/ss/requests.c
@@ -1,7 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* util/ss/requests.c */
 /*
- * Various minor routines...
- *
  * Copyright 1987, 1988, 1989 by MIT
  *
  * For copyright information, see mit-sipb-copyright.h.
diff --git a/src/util/support/ipc_stream.c b/src/util/support/ipc_stream.c
index 2cea709ab..72d307054 100644
--- a/src/util/support/ipc_stream.c
+++ b/src/util/support/ipc_stream.c
@@ -1,7 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* util/support/ipc_stream.c */
 /*
- * $Header$
- *
  * Copyright 2006, 2007, 2009 Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
diff --git a/src/util/support/k5buf-int.h b/src/util/support/k5buf-int.h
index 616cee50a..cc3c04c6e 100644
--- a/src/util/support/k5buf-int.h
+++ b/src/util/support/k5buf-int.h
@@ -1,8 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-
+/* util/support/k5buf-int.h */
 /*
- * k5buf-int.h
- *
  * Copyright 2008 Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
@@ -24,10 +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.
- *
- * Internal declarations for the k5buf string buffer module.
  */
 
+/* Internal declarations for the k5buf string buffer module */
+
 #ifndef K5BUF_INT_H
 #define K5BUF_INT_H
 
diff --git a/src/util/support/k5buf.c b/src/util/support/k5buf.c
index 799c9f94d..5040dedd1 100644
--- a/src/util/support/k5buf.c
+++ b/src/util/support/k5buf.c
@@ -1,7 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* util/support/k5buf.c */
 /*
- * k5buf.c
- *
  * Copyright 2008 Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
@@ -23,10 +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.
- *
- * Implement the k5buf string buffer module.
  */
 
+/* Implement the k5buf string buffer module. */
+
 /* Can't include krb5.h here, or k5-int.h which includes it, because
    krb5.h needs to be generated with error tables, after util/et,
    which builds after this directory.  */
diff --git a/src/util/support/plugins.c b/src/util/support/plugins.c
index 4e9225407..c1520568a 100644
--- a/src/util/support/plugins.c
+++ b/src/util/support/plugins.c
@@ -1,7 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* util/support/plugins.c - Plugin module support functions */
 /*
- * util/support/plugins.c
- *
  * Copyright 2006, 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.
- *
- *
- * Plugin module support, and shims around dlopen/whatever.
  */
 
 #include "k5-plugin.h"
diff --git a/src/util/support/printf.c b/src/util/support/printf.c
index b3cf46b38..8228a4004 100644
--- a/src/util/support/printf.c
+++ b/src/util/support/printf.c
@@ -1,9 +1,8 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* util/support/printf.c */
 /*
- * printf.c
- *
- * Copyright 2003, 2004, 2005, 2007, 2008 Massachusetts Institute of Technology.
- * All Rights Reserved.
+ * Copyright 2003, 2004, 2005, 2007, 2008 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.
@@ -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.
- *
- *
- * Provide {,v}asprintf for platforms that don't have them.
  */
 
+/* Provide {,v}asprintf for platforms that don't have them. */
+
 #include "k5-platform.h"
 
 /* On error: BSD: Set *ret to NULL.  GNU: *ret is undefined.
diff --git a/src/util/support/strlcpy.c b/src/util/support/strlcpy.c
index a3abbfec9..26ac34eff 100644
--- a/src/util/support/strlcpy.c
+++ b/src/util/support/strlcpy.c
@@ -1,8 +1,4 @@
 /* -*- mode: c; c-file-style: "bsd"; indent-tabs-mode: t -*- */
-#include "k5-platform.h"
-
-/* Provide strlcpy and strlcat for platforms that don't have them. */
-
 /*
  * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
  *
@@ -19,6 +15,9 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+/* Provide strlcpy and strlcat for platforms that don't have them. */
+
+#include "k5-platform.h"
 #include <sys/types.h>
 #include <string.h>
 
diff --git a/src/util/support/supp-int.h b/src/util/support/supp-int.h
index cf8c2888f..5cd030e47 100644
--- a/src/util/support/supp-int.h
+++ b/src/util/support/supp-int.h
@@ -1,7 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* util/support/supp-int.h */
 /*
- * util/support/supp-int.h
- *
  * Copyright (C) 2006 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.
- *
+ */
+
+/*
  *
  *  Internal prototypes for the krb5support library
  */
diff --git a/src/util/support/t_k5buf.c b/src/util/support/t_k5buf.c
index a74ad858c..a6195fcec 100644
--- a/src/util/support/t_k5buf.c
+++ b/src/util/support/t_k5buf.c
@@ -1,8 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-
+/* util/support/t_k5buf.c - Test the k5buf string buffer module */
 /*
- * t_k5buf.c
- *
  * Copyright 2008 Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
@@ -24,8 +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.
- *
- * Test the k5buf string buffer module.
  */
 
 #include "k5buf-int.h"
diff --git a/src/util/support/threads.c b/src/util/support/threads.c
index dddf6aae7..4370c0589 100644
--- a/src/util/support/threads.c
+++ b/src/util/support/threads.c
@@ -1,9 +1,8 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* util/support/threads.c - Portable thread support */
 /*
- * util/support/threads.c
- *
- * Copyright 2004,2005,2006,2007,2008 by the Massachusetts Institute of Technology.
- * All Rights Reserved.
+ * Copyright 2004,2005,2006,2007,2008 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.
@@ -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.
  */
 
 #include <assert.h>
diff --git a/src/util/support/utf8.c b/src/util/support/utf8.c
index dcaa4cba4..4398275f7 100644
--- a/src/util/support/utf8.c
+++ b/src/util/support/utf8.c
@@ -1,7 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* util/support/utf8.c */
 /*
- * util/support/utf8.c
- *
  * Copyright 2008 by the Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
@@ -24,8 +23,7 @@
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
  */
-/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
- *
+/*
  * Copyright 1998-2008 The OpenLDAP Foundation.
  * All rights reserved.
  *
@@ -37,6 +35,9 @@
  * top-level directory of the distribution or, alternatively, at
  * <http://www.OpenLDAP.org/license.html>.
  */
+
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>. */
+
 /* Basic UTF-8 routines
  *
  * These routines are "dumb".  Though they understand UTF-8,
diff --git a/src/util/support/utf8_conv.c b/src/util/support/utf8_conv.c
index 47ff9511b..6e7c5880d 100644
--- a/src/util/support/utf8_conv.c
+++ b/src/util/support/utf8_conv.c
@@ -1,7 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* util/support/utf8_conv.c */
 /*
- * util/support/utf8_conv.c
- *
  * Copyright 2008 by the Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
@@ -24,8 +23,7 @@
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
  */
-/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
- *
+/*
  * Copyright 1998-2008 The OpenLDAP Foundation.
  * All rights reserved.
  *
@@ -37,7 +35,7 @@
  * top-level directory of the distribution or, alternatively, at
  * <http://www.OpenLDAP.org/license.html>.
  */
-/* Portions Copyright (C) 1999, 2000 Novell, Inc. All Rights Reserved.
+/* Copyright (C) 1999, 2000 Novell, Inc. All Rights Reserved.
  *
  * THIS WORK IS SUBJECT TO U.S. AND INTERNATIONAL COPYRIGHT LAWS AND
  * TREATIES. USE, MODIFICATION, AND REDISTRIBUTION OF THIS WORK IS SUBJECT
@@ -49,6 +47,8 @@
  * THE PERPETRATOR TO CRIMINAL AND CIVIL LIABILITY.
  */
 
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>. */
+
 /*
  * UTF-8 Conversion Routines
  *
diff --git a/src/util/support/zap.c b/src/util/support/zap.c
index ae6baf006..48512a903 100644
--- a/src/util/support/zap.c
+++ b/src/util/support/zap.c
@@ -1,8 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-
+/* util/support/zap.c */
 /*
- * zap.c
- *
  * Copyright 2009 Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
@@ -24,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.
- *
+ */
+
+/*
  * krb5int_zap() is used by zap() (a static inline function defined in
  * k5-int.h) on non-Windows, non-gcc compilers, in order to prevent the
  * compiler from inlining and optimizing out the memset() call.