fix copyrights and RCS ident style

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

23 files changed, 72 insertions, 42 deletions

diff --git a/src/lib/krb5/ccache/file/fcc-proto.h b/src/lib/krb5/ccache/file/fcc-proto.h
index d55646ad2..0456e3117 100644
--- a/src/lib/krb5/ccache/file/fcc-proto.h
+++ b/src/lib/krb5/ccache/file/fcc-proto.h
@@ -4,6 +4,7 @@
  * $Id$
  *
  * Copyright 1990,1991 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -11,7 +12,6 @@
  * Prototypes for File-based credentials cache
  */
 
-#include <krb5/copyright.h>
 
 #ifndef KRB5_FCC_PROTO__
 #define KRB5_FCC_PROTO__
diff --git a/src/lib/krb5/ccache/file/fcc.h b/src/lib/krb5/ccache/file/fcc.h
index c310b1c93..4efaa2778 100644
--- a/src/lib/krb5/ccache/file/fcc.h
+++ b/src/lib/krb5/ccache/file/fcc.h
@@ -4,6 +4,7 @@
  * $Id$
  *
  * Copyright 1990,1991 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -12,7 +13,6 @@
  * file-based credential cache routines.
  */
 
-#include <krb5/copyright.h>
 
 #ifndef __KRB5_FILE_CCACHE__
 #define __KRB5_FILE_CCACHE__
diff --git a/src/lib/krb5/ccache/file/fcc_close.c b/src/lib/krb5/ccache/file/fcc_close.c
index dd3bc1c82..b50b3bbe0 100644
--- a/src/lib/krb5/ccache/file/fcc_close.c
+++ b/src/lib/krb5/ccache/file/fcc_close.c
@@ -3,6 +3,7 @@
  * $Author$
  *
  * Copyright 1990,1991 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -11,10 +12,10 @@
  */
 
 #if !defined(lint) && !defined(SABER)
-static char rcsid_fcc_close_c[] = "$Id$";
+static char rcsid_fcc_close_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
-#include <krb5/copyright.h>
 
 #include "fcc.h"
 
diff --git a/src/lib/krb5/ccache/file/fcc_defnam.c b/src/lib/krb5/ccache/file/fcc_defnam.c
index b092c1443..830617833 100644
--- a/src/lib/krb5/ccache/file/fcc_defnam.c
+++ b/src/lib/krb5/ccache/file/fcc_defnam.c
@@ -9,6 +9,7 @@
  * $Author$
  *
  * Copyright 1990 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -17,12 +18,12 @@
  */
 
 #if !defined(lint) && !defined(SABER)
-static char rcsid_fcc_defnam_c[] = "$Id$";
+static char rcsid_fcc_defnam_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
 #include "fcc.h"
 
-#include <krb5/copyright.h>
 
 static char krb5_default_name_string[KRB5_FCC_MAXLEN] = "";
 
diff --git a/src/lib/krb5/ccache/file/fcc_defops.c b/src/lib/krb5/ccache/file/fcc_defops.c
index b0dba8d98..306eae956 100644
--- a/src/lib/krb5/ccache/file/fcc_defops.c
+++ b/src/lib/krb5/ccache/file/fcc_defops.c
@@ -3,6 +3,7 @@
  * $Author$
  *
  * Copyright 1990 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -11,10 +12,10 @@
  */
 
 #if !defined(lint) && !defined(SABER)
-static char rcsid_fcc_defops_c[] = "$Id$";
+static char rcsid_fcc_defops_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
-#include <krb5/copyright.h>
 
 #include "fcc.h"
 
diff --git a/src/lib/krb5/ccache/file/fcc_destry.c b/src/lib/krb5/ccache/file/fcc_destry.c
index 5da24363c..8c55f1545 100644
--- a/src/lib/krb5/ccache/file/fcc_destry.c
+++ b/src/lib/krb5/ccache/file/fcc_destry.c
@@ -3,6 +3,7 @@
  * $Author$
  *
  * Copyright 1990 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -11,10 +12,10 @@
  */
 
 #if !defined(lint) && !defined(SABER)
-static char rcsid_fcc_destry_c[] = "$Id$";
+static char rcsid_fcc_destry_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
-#include <krb5/copyright.h>
 
 #include "fcc.h"
 
diff --git a/src/lib/krb5/ccache/file/fcc_errs.c b/src/lib/krb5/ccache/file/fcc_errs.c
index cd0704c23..d6bd78159 100644
--- a/src/lib/krb5/ccache/file/fcc_errs.c
+++ b/src/lib/krb5/ccache/file/fcc_errs.c
@@ -3,6 +3,7 @@
  * $Author$
  *
  * Copyright 1990 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -15,7 +16,6 @@ static char rcsid_fcc_errs_c [] =
 "$Id$";
 #endif	/* !lint & !SABER */
 
-#include <krb5/copyright.h>
 
 #include "fcc.h"
 
diff --git a/src/lib/krb5/ccache/file/fcc_eseq.c b/src/lib/krb5/ccache/file/fcc_eseq.c
index 700d21d72..1dd82189f 100644
--- a/src/lib/krb5/ccache/file/fcc_eseq.c
+++ b/src/lib/krb5/ccache/file/fcc_eseq.c
@@ -3,6 +3,7 @@
  * $Author$
  *
  * Copyright 1990,1991 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -11,10 +12,10 @@
  */
 
 #if !defined(lint) && !defined(SABER)
-static char rcsid_fcc_eseq_c[] = "$Id$";
+static char rcsid_fcc_eseq_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
-#include <krb5/copyright.h>
 #include "fcc.h"
 
 /*
diff --git a/src/lib/krb5/ccache/file/fcc_gennew.c b/src/lib/krb5/ccache/file/fcc_gennew.c
index cd012e13f..063091f13 100644
--- a/src/lib/krb5/ccache/file/fcc_gennew.c
+++ b/src/lib/krb5/ccache/file/fcc_gennew.c
@@ -3,6 +3,7 @@
  * $Author$
  *
  * Copyright 1990,1991 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -11,13 +12,13 @@
  */
 
 #if !defined(lint) && !defined(SABER)
-static char rcsid_fcc_resolve_c[] = "$Id$";
+static char rcsid_fcc_resolve_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
 #include "fcc.h"
 
 #include <netinet/in.h>			/* XXX ip only? */
-#include <krb5/copyright.h>
 
 extern krb5_cc_ops krb5_fcc_ops;
 
diff --git a/src/lib/krb5/ccache/file/fcc_getnam.c b/src/lib/krb5/ccache/file/fcc_getnam.c
index 6578dd466..ead0c9c5b 100644
--- a/src/lib/krb5/ccache/file/fcc_getnam.c
+++ b/src/lib/krb5/ccache/file/fcc_getnam.c
@@ -3,6 +3,7 @@
  * $Author$
  *
  * Copyright 1990 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -11,10 +12,10 @@
  */
 
 #if !defined(lint) && !defined(SABER)
-static char rcsid_fcc_getnam_c[] = "$Id$";
+static char rcsid_fcc_getnam_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
-#include <krb5/copyright.h>
 
 #include "fcc.h"
 
diff --git a/src/lib/krb5/ccache/file/fcc_gprin.c b/src/lib/krb5/ccache/file/fcc_gprin.c
index 5d0334cee..e87177654 100644
--- a/src/lib/krb5/ccache/file/fcc_gprin.c
+++ b/src/lib/krb5/ccache/file/fcc_gprin.c
@@ -3,6 +3,7 @@
  * $Author$
  *
  * Copyright 1990,1991 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -11,10 +12,10 @@
  */
 
 #if !defined(lint) && !defined(SABER)
-static char rcsid_fcc_gprinc_c[] = "$Id$";
+static char rcsid_fcc_gprinc_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
-#include <krb5/copyright.h>
 #include "fcc.h"
 
 /*
diff --git a/src/lib/krb5/ccache/file/fcc_init.c b/src/lib/krb5/ccache/file/fcc_init.c
index 640165e97..0348d57ed 100644
--- a/src/lib/krb5/ccache/file/fcc_init.c
+++ b/src/lib/krb5/ccache/file/fcc_init.c
@@ -3,6 +3,7 @@
  * $Author$
  *
  * Copyright 1990,1991 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -11,10 +12,10 @@
  */
 
 #if !defined(lint) && !defined(SABER)
-static char rcsid_fcc_init_c[] = "$Id$";
+static char rcsid_fcc_init_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
-#include <krb5/copyright.h>
 
 #include "fcc.h"
 
diff --git a/src/lib/krb5/ccache/file/fcc_nseq.c b/src/lib/krb5/ccache/file/fcc_nseq.c
index 4ccac0602..6bc2ab806 100644
--- a/src/lib/krb5/ccache/file/fcc_nseq.c
+++ b/src/lib/krb5/ccache/file/fcc_nseq.c
@@ -12,11 +12,10 @@
  */
 
 #if !defined(lint) && !defined(SABER)
-static char rcsid_fcc_nseq_c[] = "$Id$";
+static char rcsid_fcc_nseq_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
-#include <krb5/copyright.h>
-
 #include "fcc.h"
 
 /* XXX Deal with kret values */
diff --git a/src/lib/krb5/ccache/file/fcc_ops.c b/src/lib/krb5/ccache/file/fcc_ops.c
index d7693d66f..9fc417de7 100644
--- a/src/lib/krb5/ccache/file/fcc_ops.c
+++ b/src/lib/krb5/ccache/file/fcc_ops.c
@@ -3,6 +3,7 @@
  * $Author$
  *
  * Copyright 1990 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -11,10 +12,10 @@
  */
 
 #if !defined(lint) && !defined(SABER)
-static char rcsid_fcc_ops_c[] = "$Id$";
+static char rcsid_fcc_ops_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
-#include <krb5/copyright.h>
 
 #include "fcc.h"
 
diff --git a/src/lib/krb5/ccache/file/fcc_read.c b/src/lib/krb5/ccache/file/fcc_read.c
index 0ad749ecc..b6e6d3281 100644
--- a/src/lib/krb5/ccache/file/fcc_read.c
+++ b/src/lib/krb5/ccache/file/fcc_read.c
@@ -3,6 +3,7 @@
  * $Author$
  *
  * Copyright 1990 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -12,10 +13,10 @@
  */
 
 #if !defined(lint) && !defined(SABER)
-static char rcsid_fcc_read_c[] = "$Id$";
+static char rcsid_fcc_read_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
-#include <krb5/copyright.h>
 #include "fcc.h"
 
 #define CHECK(ret) if (ret != KRB5_OK) goto errout;
diff --git a/src/lib/krb5/ccache/file/fcc_reslv.c b/src/lib/krb5/ccache/file/fcc_reslv.c
index 3322dea21..6ad5f097c 100644
--- a/src/lib/krb5/ccache/file/fcc_reslv.c
+++ b/src/lib/krb5/ccache/file/fcc_reslv.c
@@ -3,6 +3,7 @@
  * $Author$
  *
  * Copyright 1990 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -11,10 +12,10 @@
  */
 
 #if !defined(lint) && !defined(SABER)
-static char rcsid_fcc_reslve_c[] = "$Id$";
+static char rcsid_fcc_reslve_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
-#include <krb5/copyright.h>
 
 #include "fcc.h"
 
diff --git a/src/lib/krb5/ccache/file/fcc_retrv.c b/src/lib/krb5/ccache/file/fcc_retrv.c
index d83478ccd..020f44476 100644
--- a/src/lib/krb5/ccache/file/fcc_retrv.c
+++ b/src/lib/krb5/ccache/file/fcc_retrv.c
@@ -12,10 +12,10 @@
  */
 
 #if !defined(lint) && !defined(SABER)
-static char rcsid_fcc_retrv_c[] = "$Id$";
+static char rcsid_fcc_retrv_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
-#include <krb5/copyright.h>
 
 #include "fcc.h"
 
diff --git a/src/lib/krb5/ccache/file/fcc_sflags.c b/src/lib/krb5/ccache/file/fcc_sflags.c
index 20b594a96..153f03026 100644
--- a/src/lib/krb5/ccache/file/fcc_sflags.c
+++ b/src/lib/krb5/ccache/file/fcc_sflags.c
@@ -3,6 +3,7 @@
  * $Author$
  *
  * Copyright 1990,1991 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -11,10 +12,10 @@
  */
 
 #if !defined(lint) && !defined(SABER)
-static char rcsid_fcc_set_flags_c[] = "$Id$";
+static char rcsid_fcc_set_flags_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
-#include <krb5/copyright.h>
 
 #include "fcc.h"
 
diff --git a/src/lib/krb5/ccache/file/fcc_skip.c b/src/lib/krb5/ccache/file/fcc_skip.c
index d21501aeb..633973e67 100644
--- a/src/lib/krb5/ccache/file/fcc_skip.c
+++ b/src/lib/krb5/ccache/file/fcc_skip.c
@@ -13,10 +13,10 @@
  */
 
 #if !defined(lint) && !defined(SABER)
-static char rcsid_fcc_read_c[] = "$Id$";
+static char rcsid_fcc_read_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
-#include <krb5/copyright.h>
 #include "fcc.h"
 
 krb5_error_code
diff --git a/src/lib/krb5/ccache/file/fcc_sseq.c b/src/lib/krb5/ccache/file/fcc_sseq.c
index aee5ffceb..c0a136d2c 100644
--- a/src/lib/krb5/ccache/file/fcc_sseq.c
+++ b/src/lib/krb5/ccache/file/fcc_sseq.c
@@ -12,7 +12,8 @@
  */
 
 #if !defined(lint) && !defined(SABER)
-static char rcsid_fcc_sseq_c[] = "$Id$";
+static char rcsid_fcc_sseq_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
 #include "fcc.h"
diff --git a/src/lib/krb5/ccache/file/fcc_store.c b/src/lib/krb5/ccache/file/fcc_store.c
index 336946281..9ef1b694e 100644
--- a/src/lib/krb5/ccache/file/fcc_store.c
+++ b/src/lib/krb5/ccache/file/fcc_store.c
@@ -3,6 +3,7 @@
  * $Author$
  *
  * Copyright 1990,1991 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -11,10 +12,10 @@
  */
 
 #if !defined(lint) && !defined(SABER)
-static char rcsid_fcc_store_c[] = "$Id$";
+static char rcsid_fcc_store_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
-#include <krb5/copyright.h>
 
 #include "fcc.h"
 
diff --git a/src/lib/krb5/ccache/file/fcc_test.c b/src/lib/krb5/ccache/file/fcc_test.c
index 0b866f5de..9e3ad2d70 100644
--- a/src/lib/krb5/ccache/file/fcc_test.c
+++ b/src/lib/krb5/ccache/file/fcc_test.c
@@ -1,4 +1,19 @@
-#include <krb5/copyright.h>
+/*
+ * $Source$
+ * $Author$
+ *
+ * Copyright 1990 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
+ *
+ * For copying and distribution information, please see the file
+ * <krb5/copyright.h>.
+ *
+ */
+
+#if !defined(lint) && !defined(SABER)
+static char rcsid_fcc_test_c [] =
+"$Id$";
+#endif	/* !lint & !SABER */
 
 #include "fcc.h"
 
diff --git a/src/lib/krb5/ccache/file/fcc_write.c b/src/lib/krb5/ccache/file/fcc_write.c
index 2b7dabcb6..8a6ccf316 100644
--- a/src/lib/krb5/ccache/file/fcc_write.c
+++ b/src/lib/krb5/ccache/file/fcc_write.c
@@ -3,6 +3,7 @@
  * $Author$
  *
  * Copyright 1990,1991 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -11,10 +12,10 @@
  */
 
 #if !defined(lint) && !defined(SABER)
-static char rcsid_rcsid_fcc_write_c[] = "$Id$";
+static char rcsid_rcsid_fcc_write_c[] =
+ "$Id$";
 #endif /* !lint && !SABER */
 
-#include <krb5/copyright.h>
 
 #include "fcc.h"