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 155723d8bc8c07c1d3cc363fa6fef001e9bc4a54..d263f332a4eafec0f0221499775e107dddd51673 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;
@@ -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;