fix copyrights and RCS strings

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

24 files changed, 84 insertions, 44 deletions

diff --git a/src/lib/krb5/ccache/stdio/scc-proto.h b/src/lib/krb5/ccache/stdio/scc-proto.h
index ec411c62e0..877f3fa7e6 100644
--- a/src/lib/krb5/ccache/stdio/scc-proto.h
+++ b/src/lib/krb5/ccache/stdio/scc-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_SCC_PROTO__
 #define KRB5_SCC_PROTO__
diff --git a/src/lib/krb5/ccache/stdio/scc.h b/src/lib/krb5/ccache/stdio/scc.h
index 3b624c210c..0e14ab58d2 100644
--- a/src/lib/krb5/ccache/stdio/scc.h
+++ b/src/lib/krb5/ccache/stdio/scc.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/stdio/scc_close.c b/src/lib/krb5/ccache/stdio/scc_close.c
index d4b0b019e0..9c74c3c4e0 100644
--- a/src/lib/krb5/ccache/stdio/scc_close.c
+++ b/src/lib/krb5/ccache/stdio/scc_close.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_scc_close_c[] = "$Id$";
+static char rcsid_scc_close_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
-#include <krb5/copyright.h>
 
 #include "scc.h"
 
diff --git a/src/lib/krb5/ccache/stdio/scc_defnam.c b/src/lib/krb5/ccache/stdio/scc_defnam.c
index f18c2bacef..c52f607e76 100644
--- a/src/lib/krb5/ccache/stdio/scc_defnam.c
+++ b/src/lib/krb5/ccache/stdio/scc_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_scc_defnam_c[] = "$Id$";
+static char rcsid_scc_defnam_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
 #include "scc.h"
 
-#include <krb5/copyright.h>
 
 static char krb5_default_name_string[KRB5_SCC_MAXLEN] = "";
 
diff --git a/src/lib/krb5/ccache/stdio/scc_defops.c b/src/lib/krb5/ccache/stdio/scc_defops.c
index af413fb93d..d3e75030a7 100644
--- a/src/lib/krb5/ccache/stdio/scc_defops.c
+++ b/src/lib/krb5/ccache/stdio/scc_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_scc_defops_c[] = "$Id$";
+static char rcsid_scc_defops_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
-#include <krb5/copyright.h>
 
 #include "scc.h"
 
diff --git a/src/lib/krb5/ccache/stdio/scc_destry.c b/src/lib/krb5/ccache/stdio/scc_destry.c
index 6ddaa257e1..b5e4579118 100644
--- a/src/lib/krb5/ccache/stdio/scc_destry.c
+++ b/src/lib/krb5/ccache/stdio/scc_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_scc_destry_c[] = "$Id$";
+static char rcsid_scc_destry_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
-#include <krb5/copyright.h>
 
 #include "scc.h"
 
diff --git a/src/lib/krb5/ccache/stdio/scc_errs.c b/src/lib/krb5/ccache/stdio/scc_errs.c
index 413bac69b1..2e3b40736d 100644
--- a/src/lib/krb5/ccache/stdio/scc_errs.c
+++ b/src/lib/krb5/ccache/stdio/scc_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_scc_errs_c [] =
 "$Id$";
 #endif	/* !lint & !SABER */
 
-#include <krb5/copyright.h>
 
 #include "scc.h"
 
diff --git a/src/lib/krb5/ccache/stdio/scc_eseq.c b/src/lib/krb5/ccache/stdio/scc_eseq.c
index ff51acc6ca..57fc56f2ed 100644
--- a/src/lib/krb5/ccache/stdio/scc_eseq.c
+++ b/src/lib/krb5/ccache/stdio/scc_eseq.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_scc_eseq_c[] = "$Id$";
+static char rcsid_scc_eseq_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
-#include <krb5/copyright.h>
 #include "scc.h"
 
 /*
diff --git a/src/lib/krb5/ccache/stdio/scc_gennew.c b/src/lib/krb5/ccache/stdio/scc_gennew.c
index 5deafe8c72..42dc6d6024 100644
--- a/src/lib/krb5/ccache/stdio/scc_gennew.c
+++ b/src/lib/krb5/ccache/stdio/scc_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_scc_resolve_c[] = "$Id$";
+static char rcsid_scc_resolve_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
 #include "scc.h"
 
 #include <netinet/in.h>			/* XXX ip only? */
-#include <krb5/copyright.h>
 
 extern krb5_cc_ops krb5_scc_ops;
 
diff --git a/src/lib/krb5/ccache/stdio/scc_getnam.c b/src/lib/krb5/ccache/stdio/scc_getnam.c
index 50af7aef91..cf62d2edbb 100644
--- a/src/lib/krb5/ccache/stdio/scc_getnam.c
+++ b/src/lib/krb5/ccache/stdio/scc_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_scc_getnam_c[] = "$Id$";
+static char rcsid_scc_getnam_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
-#include <krb5/copyright.h>
 
 #include "scc.h"
 
diff --git a/src/lib/krb5/ccache/stdio/scc_gprin.c b/src/lib/krb5/ccache/stdio/scc_gprin.c
index 44d768996f..a49c6c4791 100644
--- a/src/lib/krb5/ccache/stdio/scc_gprin.c
+++ b/src/lib/krb5/ccache/stdio/scc_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_scc_gprinc_c[] = "$Id$";
+static char rcsid_scc_gprinc_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
-#include <krb5/copyright.h>
 #include "scc.h"
 
 /*
diff --git a/src/lib/krb5/ccache/stdio/scc_init.c b/src/lib/krb5/ccache/stdio/scc_init.c
index 0fb6cf6d52..99a625b4ab 100644
--- a/src/lib/krb5/ccache/stdio/scc_init.c
+++ b/src/lib/krb5/ccache/stdio/scc_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_scc_init_c[] = "$Id$";
+static char rcsid_scc_init_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
-#include <krb5/copyright.h>
 
 #include "scc.h"
 
diff --git a/src/lib/krb5/ccache/stdio/scc_maybe.c b/src/lib/krb5/ccache/stdio/scc_maybe.c
index f406225f63..39b60c9e36 100644
--- a/src/lib/krb5/ccache/stdio/scc_maybe.c
+++ b/src/lib/krb5/ccache/stdio/scc_maybe.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>.
@@ -10,6 +11,11 @@
  * This file contains the source code for conditional open/close calls.
  */
 
+#if !defined(lint) && !defined(SABER)
+static char rcsid_scc_maybe_c[] =
+"$Id$";
+#endif	/* !lint & !SABER */
+
 #include "scc.h"
 #include <netinet/in.h>			/* XXX ip only? */
 
diff --git a/src/lib/krb5/ccache/stdio/scc_nseq.c b/src/lib/krb5/ccache/stdio/scc_nseq.c
index 5e8f94f6ae..d34f596aec 100644
--- a/src/lib/krb5/ccache/stdio/scc_nseq.c
+++ b/src/lib/krb5/ccache/stdio/scc_nseq.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_scc_nseq_c[] = "$Id$";
+static char rcsid_scc_nseq_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
-#include <krb5/copyright.h>
 
 #include "scc.h"
 
diff --git a/src/lib/krb5/ccache/stdio/scc_ops.c b/src/lib/krb5/ccache/stdio/scc_ops.c
index 311021749b..aec59c9181 100644
--- a/src/lib/krb5/ccache/stdio/scc_ops.c
+++ b/src/lib/krb5/ccache/stdio/scc_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_scc_ops_c[] = "$Id$";
+static char rcsid_scc_ops_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
-#include <krb5/copyright.h>
 
 #include "scc.h"
 
diff --git a/src/lib/krb5/ccache/stdio/scc_read.c b/src/lib/krb5/ccache/stdio/scc_read.c
index c17084f9cc..293c6cf245 100644
--- a/src/lib/krb5/ccache/stdio/scc_read.c
+++ b/src/lib/krb5/ccache/stdio/scc_read.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>.
@@ -12,10 +13,10 @@
  */
 
 #if !defined(lint) && !defined(SABER)
-static char rcsid_scc_read_c[] = "$Id$";
+static char rcsid_scc_read_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
-#include <krb5/copyright.h>
 #include "scc.h"
 
 #define CHECK(ret) if (ret != KRB5_OK) goto errout;
diff --git a/src/lib/krb5/ccache/stdio/scc_reslv.c b/src/lib/krb5/ccache/stdio/scc_reslv.c
index 6c05be483a..2b1f0a8218 100644
--- a/src/lib/krb5/ccache/stdio/scc_reslv.c
+++ b/src/lib/krb5/ccache/stdio/scc_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_scc_reslve_c[] = "$Id$";
+static char rcsid_scc_reslve_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
-#include <krb5/copyright.h>
 
 #include "scc.h"
 
diff --git a/src/lib/krb5/ccache/stdio/scc_retrv.c b/src/lib/krb5/ccache/stdio/scc_retrv.c
index 3e8ed0924d..2183d9a513 100644
--- a/src/lib/krb5/ccache/stdio/scc_retrv.c
+++ b/src/lib/krb5/ccache/stdio/scc_retrv.c
@@ -2,7 +2,8 @@
  * $Source$
  * $Author$
  *
- * Copyright 1990 by the Massachusetts Institute of Technology.
+ * 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_scc_retrv_c[] = "$Id$";
+static char rcsid_scc_retrv_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
-#include <krb5/copyright.h>
 
 #include "scc.h"
 
diff --git a/src/lib/krb5/ccache/stdio/scc_sflags.c b/src/lib/krb5/ccache/stdio/scc_sflags.c
index d95ede70b9..ea1c7d22e0 100644
--- a/src/lib/krb5/ccache/stdio/scc_sflags.c
+++ b/src/lib/krb5/ccache/stdio/scc_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_scc_set_flags_c[] = "$Id$";
+static char rcsid_scc_set_flags_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
-#include <krb5/copyright.h>
 
 #include "scc.h"
 
diff --git a/src/lib/krb5/ccache/stdio/scc_skip.c b/src/lib/krb5/ccache/stdio/scc_skip.c
index 8efebf1308..0865967c6d 100644
--- a/src/lib/krb5/ccache/stdio/scc_skip.c
+++ b/src/lib/krb5/ccache/stdio/scc_skip.c
@@ -2,7 +2,8 @@
  * $Source$
  * $Author$
  *
- * Copyright 1990 by the Massachusetts Institute of Technology.
+ * 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,10 +13,10 @@
  */
 
 #if !defined(lint) && !defined(SABER)
-static char rcsid_scc_read_c[] = "$Id$";
+static char rcsid_scc_read_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
-#include <krb5/copyright.h>
 #include "scc.h"
 
 krb5_error_code
diff --git a/src/lib/krb5/ccache/stdio/scc_sseq.c b/src/lib/krb5/ccache/stdio/scc_sseq.c
index d177e3df4d..71b14877eb 100644
--- a/src/lib/krb5/ccache/stdio/scc_sseq.c
+++ b/src/lib/krb5/ccache/stdio/scc_sseq.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_scc_sseq_c[] = "$Id$";
+static char rcsid_scc_sseq_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
-#include <krb5/copyright.h>
 
 #include "scc.h"
 
diff --git a/src/lib/krb5/ccache/stdio/scc_store.c b/src/lib/krb5/ccache/stdio/scc_store.c
index d54ce71403..2a5b20c243 100644
--- a/src/lib/krb5/ccache/stdio/scc_store.c
+++ b/src/lib/krb5/ccache/stdio/scc_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_scc_store_c[] = "$Id$";
+static char rcsid_scc_store_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
-#include <krb5/copyright.h>
 
 #include "scc.h"
 
diff --git a/src/lib/krb5/ccache/stdio/scc_test.c b/src/lib/krb5/ccache/stdio/scc_test.c
index 64dfddae83..a3bd497065 100644
--- a/src/lib/krb5/ccache/stdio/scc_test.c
+++ b/src/lib/krb5/ccache/stdio/scc_test.c
@@ -1,4 +1,19 @@
-#include <krb5/copyright.h>
+/*
+ * $Source$
+ * $Author$
+ *
+ * Copyright 1991 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_scc_test_c[] =
+"$Id$";
+#endif	/* !lint & !SABER */
 
 #include "scc.h"
 
diff --git a/src/lib/krb5/ccache/stdio/scc_write.c b/src/lib/krb5/ccache/stdio/scc_write.c
index 4b7062d6af..805d9d581c 100644
--- a/src/lib/krb5/ccache/stdio/scc_write.c
+++ b/src/lib/krb5/ccache/stdio/scc_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_scc_write_c[] = "$Id$";
+static char rcsid_rcsid_scc_write_c[] =
+"$Id$";
 #endif /* !lint && !SABER */
 
-#include <krb5/copyright.h>
 
 #include "scc.h"