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 155723d..d263f33 100644 (file)
--- 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;
@@ -425,8 +421,12 @@ ktc_GetToken(struct ktc_principal *server, struct ktc_token *token,
 <<<<<<< 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;