upstream commit

update sftp client and server to new buffer API. pretty
 much just mechanical changes; with & ok markus

1 files changed, 3 insertions, 2 deletions

diff --git a/sftp.c b/sftp.c
index 98a146ed4..eee472d08 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.168 2014/11/26 18:34:51 millert Exp $ */
+/* $OpenBSD: sftp.c,v 1.169 2015/01/14 13:54:13 djm Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -63,7 +63,8 @@ typedef void EditLine;
 #include "misc.h"
 
 #include "sftp.h"
-#include "buffer.h"
+#include "ssherr.h"
+#include "sshbuf.h"
 #include "sftp-common.h"
 #include "sftp-client.h"