fix copyrights and RCS strings

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

diff --git a/src/lib/krb5/ccache/stdio/scc-proto.h b/src/lib/krb5/ccache/stdio/scc-proto.h
index ec411c62e0d564be2693061ff880fbf487f00038..877f3fa7e6bde45cb9dac3f630a1aba731ce2219 100644 (file)
--- 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 3b624c210cd11cc261c2e833914628b258917359..0e14ab58d264e494b716d3d2a970c4f73c6f796c 100644 (file)
--- 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 d4b0b019e07dba481e9817385ed9156cddd18472..9c74c3c4e0b5d98d3758683ca74fb8c648cebad7 100644 (file)
--- 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 f18c2bacef1bac016774beffac13ccff54f45db1..c52f607e763e85672568911629648314decf9c41 100644 (file)
--- 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 af413fb93dbb2710b536294db24598fab456692d..d3e75030a7a0110f89611098bf6f60f59747f3ea 100644 (file)
--- 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 6ddaa257e1135cd03c11881769660c11187807c0..b5e457911861707d7469d32b17320cf6ae1e7884 100644 (file)
--- 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 413bac69b17f35b9faf5f559c4d14f35897c8eaa..2e3b40736dd96ee8ef19084d3c32e618634742f0 100644 (file)
--- 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 ff51acc6ca1d7a19020026015d25f2ff8dad545b..57fc56f2ed9d57f2dcafb3e557b9c751daf3f814 100644 (file)
--- 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 5deafe8c72657dd57bacbceac7cf20c146f64916..42dc6d6024585158251b255162b9a673af2de882 100644 (file)
--- 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 50af7aef91dab96e28ac04e789efc6a39bf52bc5..cf62d2edbb4152d8a9de3ae64e2195481ba10b9f 100644 (file)
--- 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 44d768996f7e3b9a42f0b90ad9971fb9c6f9e662..a49c6c47910f2d2fedcee32985c0e7d67e752273 100644 (file)
--- 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 0fb6cf6d526585d39752ce01aad72dfbaae85865..99a625b4ab37bea6d96ab1fd66c269e79d127b0b 100644 (file)
--- 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 f406225f63cca246cd07685ba8bfa5a765ae0ae2..39b60c9e36bbfd4d478d1f53eec6c6ceaf24a9e1 100644 (file)
--- 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 5e8f94f6ae41ca234aa14dec722ebd4b8c7b7960..d34f596aecb3f3e306616b368dabd6f8b8562b2c 100644 (file)
--- 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 311021749b4e3272f59fb37744b5435a79f8e3f9..aec59c91813c2111c007cf4615a0562d901f66d0 100644 (file)
--- 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 c17084f9cc900b2be250a69798eb5eb47ca5e2d1..293c6cf245c95af8c07238bb78d1f156244bd505 100644 (file)
--- 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 6c05be483abfb69117a16c662f978daf5c3dc4f1..2b1f0a821813f0614dd71adb1bd317399fa5f6b3 100644 (file)
--- 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 3e8ed0924dd2ad9b6938428a6931c76a0f5f3f98..2183d9a513e672fde0ea9b32851027dd6cc086e3 100644 (file)
--- 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 d95ede70b9a1b8efe0d8bd95b5b99b52dc5fe139..ea1c7d22e08bb6204157d82964c79b37d81d428c 100644 (file)
--- 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 8efebf13084f95cd7dc8695cac58fc6bd51471c4..0865967c6d6e137057e61c528443be3c7ecc23d6 100644 (file)
--- 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 d177e3df4dbca7eee71bc6dcf0e800194b9f53dc..71b14877eb9535279297cfc8f3f180f1c15abbc9 100644 (file)
--- 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 d54ce7140334e4b2dedc5526a971092428096c97..2a5b20c243c768990342fb93154359aea163e04e 100644 (file)
--- 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 64dfddae835da927645de512854374485eda06a1..a3bd497065faeb4ba8f16e322f6aee76e6ad6215 100644 (file)
--- 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 4b7062d6afacfc119f449f9bef4540c22d771e0f..805d9d581cb03237708bc50fed8fcbd9b0405d86 100644 (file)
--- 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"