From 1e512080749f8d6f629b397553564816f9fd4b6c Mon Sep 17 00:00:00 2001
From: kris <kris@FreeBSD.org>
Date: Sat, 3 Jun 2000 09:23:13 +0000
Subject: Resolve conflicts

---
 crypto/openssh/ssh.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'crypto/openssh')

diff --git a/crypto/openssh/ssh.h b/crypto/openssh/ssh.h
index df61945..8024f51 100644
--- a/crypto/openssh/ssh.h
+++ b/crypto/openssh/ssh.h
@@ -14,7 +14,7 @@
  * $FreeBSD$
  */
 
-/* RCSID("$Id: ssh.h,v 1.45 2000/05/08 17:12:16 markus Exp $"); */
+/* RCSID("$Id: ssh.h,v 1.46 2000/05/17 08:20:15 markus Exp $"); */
 
 #ifndef SSH_H
 #define SSH_H
@@ -455,6 +455,12 @@ void    fatal_remove_cleanup(void (*proc) (void *context), void *context);
  */
 char   *tilde_expand_filename(const char *filename, uid_t my_uid);
 
+/* remove newline at end of string */
+char	*chop(char *s);
+
+/* set filedescriptor to non-blocking */
+void	set_nonblock(int fd);
+
 /*
  * Performs the interactive session.  This handles data transmission between
  * the client and the program.  Note that the notion of stdin, stdout, and
-- 
cgit v1.1