← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/ntp/gutsy

« back to all changes in this revision

Viewing changes to ports/winnt/libntp/dnslookup.c

  • Committer: Bazaar Package Importer
  • Author(s): Steve Kowalik
  • Date: 2007-05-18 22:41:56 UTC
  • mfrom: (1.2.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20070518224156-563ruqxsxvqvoy8h
Tags: 1:4.2.4p0+dfsg-1ubuntu1
* Merge from Debian unstable.
* Remaining Ubuntu changes:
  - Update version in conflicts/replaces to that which was shipped in edgy,
    which was later than that in Debian (due to the ubuntuX).
  - Change default server to ntp.ubuntu.com.
  - Remove stop links from rc0 and rc6
  - Call dh_installinit with --error-handler
  - Set Ubuntu maintainer address.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ports/winnt/libntp/dnslookup.c
92
92
        memcpy(sinaddr, &sin->sin_addr, sizeof(struct in_addr));
93
93
        
94
94
        (*cnt)++;
95
 
        *Addresses = addr;
 
95
        *Addresses = (char *) addr_list;
96
96
        return 0;
97
97
}
98
98
 
105
105
{
106
106
        char buffer[sizeof(WSAQUERYSET) + 2048];
107
107
        WSAQUERYSET query;
108
 
        hostent_t *addr = NULL;
 
108
        struct hostent *addr = NULL;
109
109
        char *bufaddr = NULL;
110
110
        char ** addrlist = &bufaddr;
111
111
        int addrcnt = 0;
145
145
         */
146
146
        retcode = EAI_NONAME;
147
147
        dwLength = sizeof(buffer);
148
 
        *addrlist = NULL;
149
148
 
150
149
        while(err == 0)         /* Drop out when error */
151
150
        {
164
163
                                memset(addr, 0, sizeof(struct hostent));
165
164
                                addr->h_addrtype = (short) results->lpcsaBuffer->iSocketType;
166
165
                                addr->h_length = sizeof(struct in_addr); /* Only passing back the address */
 
166
                                addrlist = malloc(sizeof(char *));
 
167
                                *addrlist = NULL;
167
168
                        }
168
169
                        for (i = 0; i < results->dwNumberOfCsAddrs; i++)
169
170
                        {
177
178
                addr->h_name = (char *) name;
178
179
                addr->h_addr_list = addrlist;
179
180
                retcode = 0;
 
181
                *Addresses = addr;
180
182
        }
181
183
        else
182
184
        {
189
191
#endif
190
192
                retcode = ReturnCode(errcode);
191
193
        }
192
 
        *Addresses = addr;
193
194
        WSALookupServiceEnd(handle);
194
195
        return (retcode);
195
196
}