diff options
Diffstat (limited to 'src/gns/w32nsp-resolve.c')
-rw-r--r-- | src/gns/w32nsp-resolve.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/gns/w32nsp-resolve.c b/src/gns/w32nsp-resolve.c index 2bbe45021..31f806343 100644 --- a/src/gns/w32nsp-resolve.c +++ b/src/gns/w32nsp-resolve.c | |||
@@ -206,6 +206,15 @@ main (int argc, char **argv) | |||
206 | else | 206 | else |
207 | wargc -= 1; | 207 | wargc -= 1; |
208 | } | 208 | } |
209 | else | ||
210 | { | ||
211 | fprintf (stderr, "Usage: %S <record type> <service name> <NSP library path> <NSP id>\n" | ||
212 | "record type - one of the following: A | AAAA | name | addr\n" | ||
213 | "service name - a string to resolve; \" \" (a space) means 'blank'\n" | ||
214 | "NSP library path - path to libw32nsp\n" | ||
215 | "NSP id - one of the following: mswdns | gnunetdns\n", | ||
216 | wargv[0]); | ||
217 | } | ||
209 | 218 | ||
210 | if (wargc == 5) | 219 | if (wargc == 5) |
211 | { | 220 | { |
@@ -219,12 +228,15 @@ main (int argc, char **argv) | |||
219 | else | 228 | else |
220 | { | 229 | { |
221 | LPNSPSTARTUP startup = (LPNSPSTARTUP) GetProcAddress (nsp, "NSPStartup"); | 230 | LPNSPSTARTUP startup = (LPNSPSTARTUP) GetProcAddress (nsp, "NSPStartup"); |
231 | if (startup == NULL) | ||
232 | startup = (LPNSPSTARTUP) GetProcAddress (nsp, "NSPStartup@8"); | ||
222 | if (startup != NULL) | 233 | if (startup != NULL) |
223 | { | 234 | { |
224 | NSP_ROUTINE api; | 235 | NSP_ROUTINE api; |
236 | api.cbSize = sizeof (api); | ||
225 | ret = startup (&prov, &api); | 237 | ret = startup (&prov, &api); |
226 | if (NO_ERROR != ret) | 238 | if (NO_ERROR != ret) |
227 | fprintf (stderr, "startup failed\n"); | 239 | fprintf (stderr, "startup failed: %lu\n", GetLastError ()); |
228 | else | 240 | else |
229 | { | 241 | { |
230 | HANDLE lookup; | 242 | HANDLE lookup; |
@@ -251,7 +263,7 @@ main (int argc, char **argv) | |||
251 | err = GetLastError (); | 263 | err = GetLastError (); |
252 | if (ret != NO_ERROR) | 264 | if (ret != NO_ERROR) |
253 | { | 265 | { |
254 | fprintf (stderr, "lookup next failed\n"); | 266 | fprintf (stderr, "lookup next failed: %lu\n", err); |
255 | } | 267 | } |
256 | else | 268 | else |
257 | { | 269 | { |