From ebbca06b045cec6367deb4eb7a947cde2090dedc Mon Sep 17 00:00:00 2001
From: Aris Adamantiadis <aris@0xbadc0de.be>
Date: Wed, 12 Mar 2008 19:42:40 +0000
Subject: last win32 changes from keisial

git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@152 7dcaeef0-15fb-0310-b436-a5af3365683c
---
 Makefile.Windows  | 2 +-
 libssh/keyfiles.c | 1 -
 samplesshd.c      | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile.Windows b/Makefile.Windows
index 4b9986de..18335e7b 100644
--- a/Makefile.Windows
+++ b/Makefile.Windows
@@ -30,4 +30,4 @@ libssh.dll: $(libssh_OBJS)
 	$(CC) -shared $(libssh_OBJS) -o libssh.dll $(LINK)
 
 clean:
-	rm -f $(libssh_OBJS) samplesshd.exe sample.exe libssh.dll config.h
+	rm -f $(libssh_OBJS) samplesshd.exe sample.exe samplesshd.o sample.o libssh.dll config.h
diff --git a/libssh/keyfiles.c b/libssh/keyfiles.c
index dafeebcd..d95d41af 100644
--- a/libssh/keyfiles.c
+++ b/libssh/keyfiles.c
@@ -37,7 +37,6 @@ MA 02111-1307, USA. */
 #include <openssl/err.h>
 #include <openssl/rsa.h>
 #endif
-#include <netinet/in.h>
 #define MAXLINESIZE 80
 #ifdef HAVE_LIBGCRYPT
 #define MAX_KEY_SIZE 32
diff --git a/samplesshd.c b/samplesshd.c
index f4f0bc12..c6088d0b 100644
--- a/samplesshd.c
+++ b/samplesshd.c
@@ -49,8 +49,8 @@ int main(int argc, char **argv){
     int sftp=0;
     int i;
     ssh_options_getopt(options,&argc,argv);
-    ssh_options_set_dsa_server_key(options,"/etc/ssh/ssh_host_dsa_key");
-    ssh_options_set_rsa_server_key(options,"/etc/ssh/ssh_host_rsa_key");
+    ssh_options_set_dsa_server_key(options, KEYS_FOLDER "ssh_host_dsa_key");
+    ssh_options_set_rsa_server_key(options, KEYS_FOLDER "ssh_host_rsa_key");
     ssh_bind=ssh_bind_new();
     ssh_bind_set_options(ssh_bind,options);
     if(ssh_bind_listen(ssh_bind)<0){
-- 
cgit