From: Jeffrey Altman <jaltman@mit.edu>
Date: Fri, 2 Apr 2004 11:54:35 +0000 (+0000)
Subject: something-weird-20040402
X-Git-Tag: openafs-devel-1_3_63~20
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=8939c5189d4ef626de580dd4790499ceaa56b2b4;p=packages%2Fo%2Fopenafs.git

something-weird-20040402


something weird.  the previous commit had diff marks.
---

diff --git a/src/auth/ktc_nt.c b/src/auth/ktc_nt.c
index d263f332a..67834d5b7 100644
--- a/src/auth/ktc_nt.c
+++ b/src/auth/ktc_nt.c
@@ -418,15 +418,7 @@ ktc_GetToken(struct ktc_principal *server, struct ktc_token *token,
 	     int tokenLen, struct ktc_principal *client)
 {
     struct ViceIoctl iob;
-<<<<<<< ktc_nt.c
     char tbuffer[TBUFFERSIZE];
-=======
-<<<<<<< ktc_nt.c
-    char tbuffer[TBUFFERSIZE];
-=======
-    char tbuffer[MAXKTCTICKETLEN];
->>>>>>> 1.11
->>>>>>> 1.12
     char *tp, *cp;
     char *ticketP;
     int ticketLen, temp;