fix copyrights and RCS ident style

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

diff --git a/src/lib/krb5/ccache/file/fcc-proto.h b/src/lib/krb5/ccache/file/fcc-proto.h
index d55646ad29df5cd3ebe2424e6686707d06ee7ed5..0456e3117b4b526c6351435af6dfdf5fdcd19cff 100644 (file)
--- 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 c310b1c93ed16303dacc28876e94932eb2ddf7ec..4efaa27786e4030f38da578ba1ea9c4dfc2c4fa8 100644 (file)
--- 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 dd3bc1c8252db9207fc38710ec90819ec00138b8..b50b3bbe0073ffed5858c7a17c432db5457238d5 100644 (file)
--- 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 b092c1443ee27923023b7bd17d489ba534a3183e..830617833646e6f2a85ae7c2ac139043c8bc0c56 100644 (file)
--- 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 b0dba8d98d51fbddc2475715102cce2f6d9c6782..306eae95677d26dd0e0b02a2ca103e220765ce86 100644 (file)
--- 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 5da24363c32fe5b0205936aca77ee83704fe7991..8c55f154514844ed9ed6fb59ca04d7d9d188b492 100644 (file)
--- 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 cd0704c23a68678ba013e55a30be2ead5e47e362..d6bd78159282311a19c8b6a1515a5ee2dbbbc351 100644 (file)
--- 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 700d21d72355e36648fe0c2aa20a974fe49abf60..1dd82189f5d29abe1af05db53216fe77751c2b02 100644 (file)
--- 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 cd012e13f48853cce19f93c89094e0332c473788..063091f13ac2f52abe1b1dbfd0e7308ec3daa323 100644 (file)
--- 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 6578dd4661ff770f1033ea8f1ad53e8f231b09b9..ead0c9c5b3cbfcf89c878bfe0ed51d61d8ec2485 100644 (file)
--- 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 5d0334cee0e1af1a66cf0c011f647c7e1207712c..e87177654c93c887ab8bf245d83e2f73a69986ea 100644 (file)
--- 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 640165e97fe536f80a481ec92e08e73d7b0ff7bd..0348d57edfab28ddf743054190c2414074a57be1 100644 (file)
--- 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 4ccac060225e4f891c281ef702a19e0a6c8143a0..6bc2ab8061c96e184d4759aeb0b4f9ece6da1e12 100644 (file)
--- 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 d7693d66fb1cf887a58239625fd14ba4cbddd89f..9fc417de70e027466feb628c9448afa85a00f9ea 100644 (file)
--- 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 0ad749eccd90409fd659546bbdec575c9f54436b..b6e6d3281c27003c1c7a765294c1c7e5fc3168c2 100644 (file)
--- 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 3322dea21b74dc9bfa18020ed2f131f1dd3131b9..6ad5f097c28631d0b51e0bcfa9b87acf472eb71a 100644 (file)
--- 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 d83478ccdf3535b7ed1da6a8f68eead950a9086d..020f444766f1b283d4d436fe70440b2f2ed178f1 100644 (file)
--- 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 20b594a96164a02b9d176a6c24f8daac8cb4b505..153f0302616b06457f51941ae34b1c00a4c7c2aa 100644 (file)
--- 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 d21501aebc4b786fe9dbe1c84b424644cd70a551..633973e678b4f9a12c67bce9b95a2376bb15b897 100644 (file)
--- 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 aee5ffcebe819322e3d7c063a784fa42c3eaabb9..c0a136d2c857d0b823b0be81780e35b2a98ba519 100644 (file)
--- 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 336946281b2367fb837b9631a6457e2ce7ff9d48..9ef1b694e688ba8c839a5fae2c794a85c4613c09 100644 (file)
--- 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 0b866f5de4bba601ce9507ccf08a1e1e7455c66a..9e3ad2d702ccdef14f9f3c30df6cc7022e1487cc 100644 (file)
--- 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 2b7dabcb680c33e61d54f9f2487292d9ff4376ac..8a6ccf316bcbce25d66955eaeababb3e2c351c2f 100644 (file)
--- 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"