From e9d6b15926214706bdc46ea1eccfab812956df1e Mon Sep 17 00:00:00 2001
From: Aris Adamantiadis <aris@0xbadc0de.be>
Date: Fri, 7 May 2010 12:55:33 +0200
Subject: First implementation of known_hosts with port read

Conflicts:

	include/libssh/misc.h
	libssh/keyfiles.c
	libssh/misc.c
---
 libssh/misc.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'libssh/misc.c')

diff --git a/libssh/misc.c b/libssh/misc.c
index 22fb1a65..7e936e15 100644
--- a/libssh/misc.c
+++ b/libssh/misc.c
@@ -118,6 +118,20 @@ int gettimeofday(struct timeval *__p, void *__t) {
 #define NSS_BUFLEN_PASSWD 4096
 #endif
 
+char *ssh_hostport(const char *host, int port){
+	char *dest;
+	size_t len;
+	if(host==NULL)
+		return NULL;
+	/* 3 for []:, 5 for 65536 and 1 for nul */
+	len=strlen(host) + 3 + 5 + 1;
+	dest=malloc(len);
+	if(dest==NULL)
+		return NULL;
+	snprintf(dest,len,"[%s]:%d",host,port);
+	return dest;
+}
+
 char *ssh_get_user_home_dir(void) {
   char *szPath = NULL;
   struct passwd pwd;
-- 
cgit