git://git.openafs.org
/
openafs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
92e83f6
)
something-weird-20040402
author
Jeffrey Altman
<jaltman@mit.edu>
Fri, 2 Apr 2004 11:54:35 +0000 (11:54 +0000)
committer
Jeffrey Altman
<jaltman@secure-endpoints.com>
Fri, 2 Apr 2004 11:54:35 +0000 (11:54 +0000)
something weird. the previous commit had diff marks.
src/auth/ktc_nt.c
patch
|
blob
|
history
diff --git
a/src/auth/ktc_nt.c
b/src/auth/ktc_nt.c
index
d263f33
..
67834d5
100644
(file)
--- 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;