updates

diff --git a/lib/silccrypt/silcrng.c b/lib/silccrypt/silcrng.c
index f68c1b806c0d59c195865f5a4008ee4c9070d046..051e222cc847d5395a130eec45f8509f3ad35b8a 100644 (file)
--- a/lib/silccrypt/silcrng.c
+++ b/lib/silccrypt/silcrng.c
@@ -28,6 +28,7 @@
 
 #include "silcincludes.h"
 
+#ifndef WIN32
 #ifdef HAVE_GETSID
 extern pid_t getsid (pid_t __pid);
 #endif
@@ -35,6 +36,7 @@ extern pid_t getsid (pid_t __pid);
 #ifdef HAVE_GETPGID
 extern pid_t getpgid (pid_t __pid);
 #endif
+#endif
 
 #undef SILC_RNG_DEBUG
 /*#define SILC_RNG_DEBUG*/

diff --git a/lib/silcsftp/sftp_util.c b/lib/silcsftp/sftp_util.c
index eb4652accfde62761205aac15da665dca6fd77e5..86cca1f975a37cb38446aea41428f63c2b4768ac 100644 (file)
--- a/lib/silcsftp/sftp_util.c
+++ b/lib/silcsftp/sftp_util.c
@@ -435,7 +435,6 @@ SilcSFTPStatus silc_sftp_map_errno(int err)
   case ENOENT:
   case ENOTDIR:
   case EBADF:
-  case ELOOP:
     ret = SILC_SFTP_STATUS_NO_SUCH_FILE;
     break;
   case EPERM:

diff --git a/lib/silcutil/win32/silcwin32net.c b/lib/silcutil/win32/silcwin32net.c
index ed7818c57ab8f467a44b034d9b9fd6427de8077b..fd8228ea8dc3334d65228f3f17bffe912b758b06 100644 (file)
--- a/lib/silcutil/win32/silcwin32net.c
+++ b/lib/silcutil/win32/silcwin32net.c
@@ -222,7 +222,7 @@ void silc_net_close_connection(int sock)
 /* Converts the IP number string from numbers-and-dots notation to
    binary form. */
 
-bool silc_net_addr2bin(const char *addr, void *bin, uint32 bin_len);
+bool silc_net_addr2bin(const char *addr, void *bin, uint32 bin_len)
 {
   unsigned long ret;
 
@@ -231,7 +231,7 @@ bool silc_net_addr2bin(const char *addr, void *bin, uint32 bin_len);
   if (bin_len < 4)
     return FALSE;
 
-  memcpy(bin, (unsigned char *)&tmp.s_addr, 4);
+  memcpy(bin, (unsigned char *)&ret, 4);
   return ret != INADDR_NONE;
 }
 

diff --git a/win32/libsilc/libsilc.def b/win32/libsilc/libsilc.def
index 44b20fb6fcf679bae73767806100c9c4607a41ad..93d2ee41c1d581f1b64ddb0ddb062308251dc1b9 100644 (file)
--- a/win32/libsilc/libsilc.def
+++ b/win32/libsilc/libsilc.def
@@ -605,7 +605,6 @@ EXPORTS
        silc_sftp_fs_memory_del_dir @ 820 ;
        silc_sftp_fs_memory_add_file @ 821 ;
        silc_sftp_fs_memory_del_file @ 822 ;
-       silc_net_addr2bin_ne @ 823 ;
        silc_file_open @ 824 ;
        silc_file_close @ 825 ;
        silc_file_read @ 826 ;