diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-03-07 09:25:48 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-03-07 09:25:48 +0000 |
| commit | 80087e6cfed8f6aa55ed396e1690dff2dc32ece7 (patch) | |
| tree | e3e2ea0265d581f15ecaafb999231cb915034633 | |
| parent | cea6fd0b0ae4131e8cb9e541a5c2e91ce226e5cd (diff) | |
| download | samba-80087e6cfed8f6aa55ed396e1690dff2dc32ece7.tar.gz samba-80087e6cfed8f6aa55ed396e1690dff2dc32ece7.tar.bz2 samba-80087e6cfed8f6aa55ed396e1690dff2dc32ece7.zip | |
safe_strcpy() -> fstrcpy() fix, and a cleanup to how rpcclient calls the
IP address resolving code.
(This used to be commit 1f605fe77c56ee2a7838c9f87eedf4bb91ebf688)
| -rw-r--r-- | source3/rpcclient/cmd_reg.c | 2 | ||||
| -rw-r--r-- | source3/rpcclient/rpcclient.c | 11 |
2 files changed, 4 insertions, 9 deletions
diff --git a/source3/rpcclient/cmd_reg.c b/source3/rpcclient/cmd_reg.c index 19c0e7f71f..8943331dab 100644 --- a/source3/rpcclient/cmd_reg.c +++ b/source3/rpcclient/cmd_reg.c @@ -914,7 +914,7 @@ static NTSTATUS cmd_reg_shutdown(struct cli_state *cli, TALLOC_CTX *mem_ctx, switch (opt) { case 'm': - safe_strcpy(msg, optarg, sizeof(msg)-1); + fstrcpy(msg, optarg); /*fprintf (stderr, "[%s|%s]\n", optarg, msg);*/ break; diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c index 127506fb39..c3b2cd4ea1 100644 --- a/source3/rpcclient/rpcclient.c +++ b/source3/rpcclient/rpcclient.c @@ -592,6 +592,8 @@ out_free: { NULL } }; + ZERO_STRUCT(server_ip); + setlinebuf(stdout); /* Parse options */ @@ -674,13 +676,6 @@ out_free: if (!init_names()) return 1; - /* Resolve the IP address */ - - if (!opt_ipaddr && !resolve_name(server, &server_ip, 0x20)) { - fprintf(stderr, "Unable to resolve %s\n", server); - return 1; - } - /* * Get password * from stdin if necessary @@ -697,7 +692,7 @@ out_free: get_username(username); nt_status = cli_full_connection(&cli, global_myname(), server, - &server_ip, 0, + opt_ipaddr ? &server_ip : NULL, 0, "IPC$", "IPC", username, domain, password, 0, NULL); |