summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2008-06-11 09:35:37 +1000
committerDarren Tucker <dtucker@zip.com.au>2008-06-11 09:35:37 +1000
commit2a8b138ed852625abeb56192f8439061761bdb93 (patch)
tree752678c379588b97dc7a3264831b1228723f728c
parent896ad5a4e40c48fa9bea71624830cc9cc3ce4fe0 (diff)
- dtucker@cvs.openbsd.org 2008/06/10 23:21:34
[bufaux.c] Use '\0' for a nul byte rather than unadorned 0. ok djm@
-rw-r--r--ChangeLog5
-rw-r--r--bufaux.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 48b51a4eb..dd3335bc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -55,6 +55,9 @@
55 [auth-options.c match.c servconf.c addrmatch.c sshd.8] 55 [auth-options.c match.c servconf.c addrmatch.c sshd.8]
56 support CIDR address matching in .ssh/authorized_keys from="..." stanzas 56 support CIDR address matching in .ssh/authorized_keys from="..." stanzas
57 ok and extensive testing dtucker@ 57 ok and extensive testing dtucker@
58 - dtucker@cvs.openbsd.org 2008/06/10 23:21:34
59 [bufaux.c]
60 Use '\0' for a nul byte rather than unadorned 0. ok djm@
58 - (dtucker) [openbsd-compat/fake-rfc2553.h] Add sin6_scope_id to sockaddr_in6 61 - (dtucker) [openbsd-compat/fake-rfc2553.h] Add sin6_scope_id to sockaddr_in6
59 since the new CIDR code in addmatch.c references it. 62 since the new CIDR code in addmatch.c references it.
60 - (dtucker) [Makefile.in configure.ac regress/addrmatch.sh] Skip IPv6 63 - (dtucker) [Makefile.in configure.ac regress/addrmatch.sh] Skip IPv6
@@ -4147,4 +4150,4 @@
4147 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4150 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4148 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4151 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4149 4152
4150$Id: ChangeLog,v 1.4963 2008/06/10 23:34:46 dtucker Exp $ 4153$Id: ChangeLog,v 1.4964 2008/06/10 23:35:37 dtucker Exp $
diff --git a/bufaux.c b/bufaux.c
index f03363994..cd9a35ded 100644
--- a/bufaux.c
+++ b/bufaux.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: bufaux.c,v 1.45 2008/05/08 06:59:01 markus Exp $ */ 1/* $OpenBSD: bufaux.c,v 1.46 2008/06/10 23:21:34 dtucker Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -180,7 +180,7 @@ buffer_get_string_ret(Buffer *buffer, u_int *length_ptr)
180 return (NULL); 180 return (NULL);
181 } 181 }
182 /* Append a null character to make processing easier. */ 182 /* Append a null character to make processing easier. */
183 value[len] = 0; 183 value[len] = '\0';
184 /* Optionally return the length of the string. */ 184 /* Optionally return the length of the string. */
185 if (length_ptr) 185 if (length_ptr)
186 *length_ptr = len; 186 *length_ptr = len;