lib: fixed a small issue with windows address parsing

bareos · Sep 23, 2021 · 0c92a52 · 0c92a52
1 parent 75b3474
commit 0c92a52
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 9 deletions.
diff --git a/core/src/lib/bnet.cc b/core/src/lib/bnet.cc
@@ -417,11 +417,7 @@ dlist<IPADDR>* BnetHost2IpAddrs(const char* host,
     addr->SetAddr4(&inaddr);
     addr_list->append(addr);
 #ifdef HAVE_IPV6
-#  ifndef HAVE_WIN32
   } else if (inet_pton(AF_INET6, host, &inaddr6) == 1) {
-#  else
-  } else if (p_InetPton && p_InetPton(AF_INET6, host, &inaddr6) == 1) {
-#  endif
     addr = new IPADDR(AF_INET6);
     addr->SetType(IPADDR::R_MULTIPLE);
     addr->SetAddr6(&inaddr6);

diff --git a/core/src/win32/compat/winapi.cc b/core/src/win32/compat/winapi.cc
@@ -105,7 +105,6 @@ t_CreateProcessW p_CreateProcessW = NULL;
 t_GetLogicalDriveStringsA p_GetLogicalDriveStringsA = NULL;
 t_GetLogicalDriveStringsW p_GetLogicalDriveStringsW = NULL;
 
-t_InetPton p_InetPton = NULL;
 
 void InitWinAPIWrapper()
 {
@@ -259,8 +258,5 @@ void InitWinAPIWrapper()
     }
   }
 
-  hLib = LoadLibraryA("WS2_32.DLL");
-  if (hLib) { p_InetPton = (t_InetPton)GetProcAddress(hLib, "InetPtonA"); }
-
   atexit(Win32TSDCleanup);
 }
diff --git a/core/src/win32/include/winapi.h b/core/src/win32/include/winapi.h
@@ -275,7 +275,6 @@ extern t_SHGetFolderPath p_SHGetFolderPath;
 typedef INT(WSAAPI* t_InetPton)(INT Family,
                                 PCTSTR pszAddrString,
                                 PVOID pAddrBuf);
-extern t_InetPton p_InetPton;
 
 #endif
 #endif  // BAREOS_WIN32_INCLUDE_WINAPI_H_