From: Jeffrey Altman <jaltman@mit.edu>
Date: Fri, 2 Apr 2004 11:52:49 +0000 (+0000)
Subject: one-more-try-20040402
X-Git-Tag: openafs-devel-1_3_63~21
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=92e83f6d684d967d3fdbb4c2147a98a3eba45fbf;p=packages%2Fo%2Fopenafs.git

one-more-try-20040402


much too sleepy.  TBUFFERSIZE for all tbuffers
---

diff --git a/src/auth/ktc_nt.c b/src/auth/ktc_nt.c
index 155723d8b..d263f332a 100644
--- a/src/auth/ktc_nt.c
+++ b/src/auth/ktc_nt.c
@@ -250,11 +250,7 @@ ktc_SetToken(struct ktc_principal *server, struct ktc_token *token,
 	     struct ktc_principal *client, int flags)
 {
     struct ViceIoctl iob;
-<<<<<<< ktc_nt.c
     char tbuffer[TBUFFERSIZE];
-=======
-    char tbuffer[MAXKTCTICKETLEN];
->>>>>>> 1.11
     char *tp;
     struct ClearToken ct;
     int temp;
@@ -422,11 +418,15 @@ 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;