summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-09-02 22:56:18 +1000
committerDamien Miller <djm@mindrot.org>2003-09-02 22:56:18 +1000
commita0c4ad21b67c4d27678550508e049a0a24f89cad (patch)
tree0e7daaebcfc0d0af29933abf3ec5ebeab41d39da
parent324948b320631096a1d33c9d984fcdbfa35b203a (diff)
- markus@cvs.openbsd.org 2003/08/31 13:30:18
[gss-serv.c] correct string termination in parse_ename(); sxw@inf.ed.ac.uk
-rw-r--r--ChangeLog5
-rw-r--r--gss-serv.c7
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 262c8e3c1..442389a7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,9 @@
26 [session.c] 26 [session.c]
27 call ssh_gssapi_storecreds conditionally from do_exec(); 27 call ssh_gssapi_storecreds conditionally from do_exec();
28 with sxw@inf.ed.ac.uk 28 with sxw@inf.ed.ac.uk
29 - markus@cvs.openbsd.org 2003/08/31 13:30:18
30 [gss-serv.c]
31 correct string termination in parse_ename(); sxw@inf.ed.ac.uk
29 32
3020030829 3320030829
31 - (bal) openbsd-compat/ clean up. Considate headers, add in Id on our 34 - (bal) openbsd-compat/ clean up. Considate headers, add in Id on our
@@ -941,4 +944,4 @@
941 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 944 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
942 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 945 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
943 946
944$Id: ChangeLog,v 1.2926 2003/09/02 12:55:45 djm Exp $ 947$Id: ChangeLog,v 1.2927 2003/09/02 12:56:18 djm Exp $
diff --git a/gss-serv.c b/gss-serv.c
index 42718177d..8eb20e955 100644
--- a/gss-serv.c
+++ b/gss-serv.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: gss-serv.c,v 1.1 2003/08/22 10:56:09 markus Exp $ */ 1/* $OpenBSD: gss-serv.c,v 1.2 2003/08/31 13:30:18 markus Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. 4 * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
@@ -178,9 +178,10 @@ ssh_gssapi_parse_ename(Gssctxt *ctx, gss_buffer_t ename, gss_buffer_t name)
178 if (ename->length < offset+name->length) 178 if (ename->length < offset+name->length)
179 return GSS_S_FAILURE; 179 return GSS_S_FAILURE;
180 180
181 name->value = xmalloc(name->length); 181 name->value = xmalloc(name->length+1);
182 memcpy(name->value,tok+offset,name->length); 182 memcpy(name->value,tok+offset,name->length);
183 183 ((char *)name->value)[name->length] = 0;
184
184 return GSS_S_COMPLETE; 185 return GSS_S_COMPLETE;
185} 186}
186 187