Merge 6.6p1.

* New upstream release (http://www.openssh.com/txt/release-6.6).

1 files changed, 2 insertions, 2 deletions

diff --git a/sftp-client.c b/sftp-client.c
index fc035f2ef..2f5907c85 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-client.c,v 1.113 2014/01/17 00:21:06 djm Exp $ */
+/* $OpenBSD: sftp-client.c,v 1.114 2014/01/31 16:39:19 tedu Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -310,7 +310,7 @@ get_decode_statvfs(struct sftp_conn *conn, struct sftp_statvfs *st,
                     SSH2_FXP_EXTENDED_REPLY, type);
         }
 
-        bzero(st, sizeof(*st));
+        memset(st, 0, sizeof(*st));
         st->f_bsize = buffer_get_int64(&msg);
         st->f_frsize = buffer_get_int64(&msg);
         st->f_blocks = buffer_get_int64(&msg);