Include config.h. Include kerberosIV/krb.h or krb.h depending on the

Autoconf results.  Remove the evil $Log$ keyword from the source and use
a much simpler file header.

diff --git a/encrypt.c b/encrypt.c
index c26b17b7592861599bc4832bb7c27d5c40bfba19..01159adb46fefb90727da5b1c7fde20474dfd4c3 100644 (file)
--- a/encrypt.c
+++ b/encrypt.c
@@ -1,45 +1,27 @@
-/***********************************************************************
- *
- * encrypt.c - routines to send and receive encrypted chunks using
- *             the krb_mk_priv and krb_rd_priv routines. A chunk
- *             consists of a network long "n" (the length) followed
- *             by "n" bytes of encrypted data.
- *
- * $Id$
- *
- * $Log$
- * Revision 1.4  2005/05/18 06:08:37  eagle
- * Fix lots of warnings.
- *
- * Revision 1.3  2003/08/18 19:03:26  eagle
- * Update the arguments for send_encrypted_chunk and receive_encrypted_chunk
- * to match the header prototypes for Kerberos v5 1.3.x.  This will now
- * produce warnings for Kerberos v5 1.2.x, but it should end up being
- * equivalent, and this method is more completely correct.
- *
- * Revision 1.2  2001/03/06 15:02:11  bbense
- * Ported to Solaris 2.7 and new krb5 k4 libraries.
- *
- * Revision 1.1  1994/06/08 17:21:41  schemers
- * Initial revision
- *
- *
- *----------------------------------------------------------------------
- * Copyright (c) 1994 Board of Trustees, Leland Stanford Jr. University
- ***********************************************************************/
+/*  $Id$
+**
+**  Routines to send and receive encrypted chunks using the krb_mk_priv and
+**  krb_rd_priv routines.  A chunk consists of a network long "n" (the length)
+**  followed by "n" bytes of encrypted data.
+*/
+
+#include "config.h"
 
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
-#include <krb.h>
 #include <errno.h>
-
-#include <memory.h>
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef HAVE_KERBEROSIV_KRB_H
+# include <kerberosIV/krb.h>
+#else
+# include <krb.h>
+#endif
+
 #include "kftgt.h"
 
 int 

diff --git a/kftgt.c b/kftgt.c
index 9aaa5130b4d975b4c5824bf00aa5dbb12469a87c..9930af95dd683396267d0537c728efba98a91e66 100644 (file)
--- a/kftgt.c
+++ b/kftgt.c
@@ -1,46 +1,14 @@
-/***************************************************************************
- *
- * kftgt.c -   client program for kftgtd
- *
- * $Id$
- *
- * $Log$
- * Revision 1.8  2005/05/18 06:08:37  eagle
- * Fix lots of warnings.
- *
- * Revision 1.7  2003/08/18 19:03:27  eagle
- * Update the arguments for send_encrypted_chunk and receive_encrypted_chunk
- * to match the header prototypes for Kerberos v5 1.3.x.  This will now
- * produce warnings for Kerberos v5 1.2.x, but it should end up being
- * equivalent, and this method is more completely correct.
- *
- * Revision 1.6  2003/03/04 00:59:26  eagle
- * Return specific error codes on any failures.
- *
- * Revision 1.5  2001/03/22 19:18:43  bbense
- * Minor tweaks to get rid of warnings.
- *
- * Revision 1.4  1997/11/24 18:33:34  opusl
- * fix usage string
- *
- * Revision 1.3  1997/11/24 18:14:31  opusl
- * allow forwarding to multiple hosts and usernames (MASSIVE reorg)
- *
- * Revision 1.2  1997/10/26 03:49:14  opusl
- * reformat, ANSIfy
- *
- * Revision 1.1  1994/06/08 17:28:04  schemers
- * Initial revision
- *
- *
- *--------------------------------------------------------------------------
- * Copyright (c) 1994,1997 Board of Trustees, Leland Stanford Jr. University
- ***************************************************************************/
+/*  $Id$
+**
+**  Client program for Kerberos v4 ticket forwarding.
+*/
 
 /*
  * INCLUDES
  */
 
+#include "config.h"
+
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -49,7 +17,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-#include <krb.h>
 #include <errno.h>
 #include <memory.h>
 #include <string.h>
@@ -57,6 +24,12 @@
 #include <signal.h>
 #include <stdarg.h>
 
+#ifdef HAVE_KERBEROSIV_KRB_H
+# include <kerberosIV/krb.h>
+#else
+# include <krb.h>
+#endif
+
 #include "kftgt.h"
 #include "encrypt.h"
 #include "marsh.h"

diff --git a/kftgtd.c b/kftgtd.c
index 08fd4b7a71b680e2fe7fc9ae8763c5a7255828a4..dd35f7ffd42428430524cecd16442803e0962d14 100644 (file)
--- a/kftgtd.c
+++ b/kftgtd.c
@@ -1,35 +1,9 @@
-/***********************************************************************
- *
- * kftgtd.c -   server program for kftgt
- *
- * $Id$
- *
- * $Log$
- * Revision 1.6  2005/05/18 06:08:37  eagle
- * Fix lots of warnings.
- *
- * Revision 1.5  2003/08/18 19:03:27  eagle
- * Update the arguments for send_encrypted_chunk and receive_encrypted_chunk
- * to match the header prototypes for Kerberos v5 1.3.x.  This will now
- * produce warnings for Kerberos v5 1.2.x, but it should end up being
- * equivalent, and this method is more completely correct.
- *
- * Revision 1.4  2001/03/22 19:18:43  bbense
- * Minor tweaks to get rid of warnings.
- *
- * Revision 1.3  2001/03/06 15:02:11  bbense
- * Ported to Solaris 2.7 and new krb5 k4 libraries.
- *
- * Revision 1.2  1997/10/26 03:03:05  opusl
- * strncmp not strcmp on the version string
- *
- * Revision 1.1  1994/06/08  17:28:14  schemers
- * Initial revision
- *
- *
- *----------------------------------------------------------------------
- * Copyright (c) 1994 Board of Trustees, Leland Stanford Jr. University
- ***********************************************************************/
+/*  $Id$
+**
+**  Server program for Kerberos v4 ticket forwarding.
+*/
+
+#include "config.h"
 
 #include <stdio.h>
 #include <sys/types.h>
@@ -45,7 +19,11 @@
 #include <signal.h>
 #include <unistd.h>
 
-#include <krb.h>
+#ifdef HAVE_KERBEROSIV_KRB_H
+# include <kerberosIV/krb.h>
+#else
+# include <krb.h>
+#endif
 
 #include "kftgt.h"
 #include "encrypt.h"

diff --git a/marsh.c b/marsh.c
index 9c652c4ce44a44d2cd3eb36c496e6479ba8ba6b8..167cbdec930a29c4b23ad5b91a9ca9255ac37ebd 100644 (file)
--- a/marsh.c
+++ b/marsh.c
@@ -1,26 +1,19 @@
-/***********************************************************************
- *
- * marsh.c -   routines to marshall/unmarshall parameters and tgts
- *
- * $Id$
- *
- * $Log$
- * Revision 1.2  2005/05/18 06:08:37  eagle
- * Fix lots of warnings.
- *
- * Revision 1.1  1994/06/08 17:28:42  schemers
- * Initial revision
- *
- *
- *----------------------------------------------------------------------
- * Copyright (c) 1994 Board of Trustees, Leland Stanford Jr. University
- ***********************************************************************/
+/*  $Id$
+**
+**  Routines to marshall/unmarshall parameters and ticket-granting tickets.
+*/
+
+#include "config.h"
 
-#include <memory.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
-#include <krb.h>
+
+#ifdef HAVE_KERBEROSIV_KRB_H
+# include <kerberosIV/krb.h>
+#else
+# include <krb.h>
+#endif
 
 #include "kftgt.h"