Index: dll/win32/mswsock/mswhelper.c
===================================================================
--- dll/win32/mswsock/mswhelper.c	(revision 74695)
+++ dll/win32/mswsock/mswhelper.c	(working copy)
@@ -226,6 +226,7 @@
 BOOL
 mswBufferAppendBlob_Hostent(_Inout_ PMSW_BUFFER mswBuf,
                             _Inout_ LPWSAQUERYSETW lpRes,
+                            _In_ char** hostAliasesA,
                             _In_ char* hostnameA,
                             _In_ DWORD ip4addr)
 {
@@ -256,7 +257,7 @@
     /* aliases */
     phe->h_aliases = (char**)(mswBufferEndPtr(mswBuf) - bytesOfs);
 
-    if (!mswBufferAppendPtr(mswBuf, NULL))
+    if (!mswBufferAppendStrLstA(mswBuf, (void**)hostAliasesA, -(DWORD)bytesOfs))
         return FALSE;
 
     /* addr_list */
Index: dll/win32/mswsock/mswhelper.h
===================================================================
--- dll/win32/mswsock/mswhelper.h	(revision 74695)
+++ dll/win32/mswsock/mswhelper.h	(working copy)
@@ -69,7 +69,8 @@
 mswBufferAppendBlob_Hostent(
   _Inout_ PMSW_BUFFER mswBuf,
   _Inout_ LPWSAQUERYSETW lpRes,
-  _In_ char* hostnameA,
+    _In_ char** hostAliasesA,
+    _In_ char* hostnameA,
   _In_ DWORD ip4addr);
 
 BOOL
Index: dll/win32/mswsock/nsplookup.c
===================================================================
--- dll/win32/mswsock/nsplookup.c	(revision 74695)
+++ dll/win32/mswsock/nsplookup.c	(working copy)
@@ -106,7 +106,7 @@
 INT
 NSP_LookupServiceNextW(
   _In_ PWSHANDLEINTERN data,
-  _In_ DWORD CallID,
+  _In_ DWORD dwControlFlags,
   _Inout_ LPWSAQUERYSETW lpRes,
   _Inout_ LPDWORD lpResLen);
 
@@ -116,14 +116,14 @@
 
 INT
 NSP_GetHostByNameHeapAllocW(
-  _In_ WCHAR* name,
-  _In_ GUID* lpProviderId,
+  _In_ PWSHANDLEINTERN data,
+  _In_ DWORD dwControlFlags,
   _Out_ PWSHOSTINFOINTERN hostinfo);
 
 INT
 NSP_GetServiceByNameHeapAllocW(
-  _In_ WCHAR* nameW,
-  _In_ GUID* lpProviderId,
+  _In_ PWSHANDLEINTERN data,
+  _In_ DWORD dwControlFlags,
   _Out_ PWSHOSTINFOINTERN hostinfo);
 
 /* Implementations - Internal */
@@ -303,7 +303,7 @@
     lpqsResults->dwSize = sizeof(*lpqsResults);
 
     wsaErr = NSP_LookupServiceNextW(pLook,
-                                    pLook->CallID,
+                                    dwControlFlags,
                                     lpqsResults,
                                     lpdwBufferLength);
 
@@ -464,8 +464,8 @@
 }
 
 INT
-NSP_GetHostByNameHeapAllocW(_In_ WCHAR* name,
-                            _In_ GUID* lpProviderId,
+NSP_GetHostByNameHeapAllocW(_In_ PWSHANDLEINTERN data,
+                            _In_ DWORD dwControlFlags,
                             _Out_ PWSHOSTINFOINTERN hostinfo)
 {
     HANDLE hHeap = GetProcessHeap();
@@ -474,21 +474,27 @@
     PDNS_RECORD dp;
     PDNS_RECORD curr;
     INT result = ERROR_SUCCESS;
+    DWORD dwQueryFlags = DNS_QUERY_STANDARD;
 
     /* needed to be cleaned up if != NULL */
     dp = NULL;
 
-    if (name == NULL)
+    if (data->hostnameW == NULL)
     {
         result = ERROR_INVALID_PARAMETER;
         goto cleanup;
     }
 
+    if ((data->dwControlFlags & LUP_DEEP) == 0)
+    {
+        dwQueryFlags |= DNS_QUERY_NO_RECURSION;
+    }
+
     /* DNS_TYPE_A: include/WinDNS.h */
     /* DnsQuery -- lib/dnsapi/dnsapi/query.c */
-    dns_status = DnsQuery(name,
+    dns_status = DnsQuery(data->hostnameW,
                           DNS_TYPE_A,
-                          DNS_QUERY_STANDARD,
+                          dwQueryFlags,
                           /* extra dns servers */ 0,
                           &dp,
                           0);
@@ -684,8 +690,8 @@
 }
 
 INT
-NSP_GetServiceByNameHeapAllocW(_In_ WCHAR* nameW,
-                               _In_ GUID* lpProviderId,
+NSP_GetServiceByNameHeapAllocW(_In_ PWSHANDLEINTERN data,
+                               _In_ DWORD dwControlFlags,
                                _Out_ PWSHOSTINFOINTERN hostinfo)
 {
     BOOL Found = FALSE;
@@ -703,7 +709,7 @@
     PCHAR nameProtoA = NULL;
     INT res = WSANO_RECOVERY;
     
-    if (!nameW)
+    if (!data->hostnameW)
     {
         res = WSANO_RECOVERY;
         goto End;
@@ -710,7 +716,7 @@
     }
 
     hHeap = GetProcessHeap();
-    nameA = StrW2AHeapAlloc(hHeap, nameW);
+    nameA = StrW2AHeapAlloc(hHeap, data->hostnameW);
 
     /* nameA has the form <service-name>/<protocol>
        we split these now */
@@ -837,7 +843,7 @@
 
 INT
 NSP_LookupServiceNextW(_In_ PWSHANDLEINTERN data,
-                       _In_ DWORD CallID,
+                       _In_ DWORD dwControlFlags,
                        _Inout_ LPWSAQUERYSETW lpRes,
                        _Inout_ LPDWORD lpResLen)
 {
@@ -860,9 +866,9 @@
     lpRes->dwSize = sizeof(*lpRes);
     lpRes->dwNameSpace = NS_DNS;
 
-    if ((CallID == NSP_CALLID_HOSTNAME) ||
-        (CallID == NSP_CALLID_HOSTBYNAME) ||
-        (CallID == NSP_CALLID_SERVICEBYNAME))
+    if ((data->CallID == NSP_CALLID_HOSTNAME) ||
+        (data->CallID == NSP_CALLID_HOSTBYNAME) ||
+        (data->CallID == NSP_CALLID_SERVICEBYNAME))
     {
         if (data->CallIDCounter >= 1)
         {
@@ -877,7 +883,7 @@
     }
     data->CallIDCounter++;
 
-    if (CallID == NSP_CALLID_HOSTNAME)
+    if (data->CallID == NSP_CALLID_HOSTNAME)
     {
         result = NSP_GetHostNameHeapAllocW(&hostinfo.hostnameW);
 
@@ -886,10 +892,10 @@
 
         hostinfo.addr4 = 0;
     }
-    else if (CallID == NSP_CALLID_HOSTBYNAME)
+    else if (data->CallID == NSP_CALLID_HOSTBYNAME)
     {
-        result = NSP_GetHostByNameHeapAllocW(data->hostnameW,
-                                             &data->providerId,
+        result = NSP_GetHostByNameHeapAllocW(data,
+                                             dwControlFlags,
                                              &hostinfo);
         if (result != ERROR_SUCCESS)
             goto End;
@@ -896,9 +902,9 @@
     }
     else
     {
-        ASSERT(CallID == NSP_CALLID_SERVICEBYNAME);
-        result = NSP_GetServiceByNameHeapAllocW(data->hostnameW,
-                                                &data->providerId,
+        ASSERT(data->CallID == NSP_CALLID_SERVICEBYNAME);
+        result = NSP_GetServiceByNameHeapAllocW(data,
+                                                dwControlFlags,
                                                 &hostinfo);
         if (result != ERROR_SUCCESS)
             goto End;
@@ -907,7 +913,7 @@
     if (((LUP_RETURN_BLOB & data->dwControlFlags) != 0) ||
         ((LUP_RETURN_NAME & data->dwControlFlags) != 0))
     {
-        if (CallID == NSP_CALLID_HOSTNAME || CallID == NSP_CALLID_HOSTBYNAME)
+        if (data->CallID == NSP_CALLID_HOSTNAME || data->CallID == NSP_CALLID_HOSTBYNAME)
         {
             ServiceInstanceNameW = hostinfo.hostnameW;
             ServiceInstanceNameA = StrW2AHeapAlloc(hHeap, ServiceInstanceNameW);
@@ -918,7 +924,7 @@
 
             }
         }
-        if (CallID == NSP_CALLID_SERVICEBYNAME)
+        if (data->CallID == NSP_CALLID_SERVICEBYNAME)
         {
             ServiceInstanceNameW = hostinfo.servnameW;
             ServiceInstanceNameA = StrW2AHeapAlloc(hHeap, ServiceInstanceNameW);
@@ -950,11 +956,12 @@
 
     if ((LUP_RETURN_BLOB & data->dwControlFlags) != 0)
     {
-        if (CallID == NSP_CALLID_HOSTBYNAME)
+        if (data->CallID == NSP_CALLID_HOSTBYNAME)
         {
             /* Write data for PBLOB (hostent) */
             if (!mswBufferAppendBlob_Hostent(&buf,
                                              lpRes,
+                                             (LUP_RETURN_ALIASES & data->dwControlFlags) != 0 ? hostinfo.servaliasesA : NULL,
                                              ServiceInstanceNameA,
                                              hostinfo.addr4))
             {
@@ -963,13 +970,13 @@
                 goto End;
             }
         }
-        else if (CallID == NSP_CALLID_SERVICEBYNAME)
+        else if (data->CallID == NSP_CALLID_SERVICEBYNAME)
         {
             /* Write data for PBLOB (servent) */
             if (!mswBufferAppendBlob_Servent(&buf,
                                              lpRes,
                                              ServiceInstanceNameA,/* ServiceName */
-                                             hostinfo.servaliasesA,
+                                             (LUP_RETURN_ALIASES & data->dwControlFlags) != 0 ? hostinfo.servaliasesA : NULL,
                                              ServiceProtocolNameA,
                                              hostinfo.servport))
             {