mirror of
https://github.com/samba-team/samba.git
synced 2024-12-27 03:21:53 +03:00
safe_strcpy() -> fstrcpy() fix, and a cleanup to how rpcclient calls the
IP address resolving code.
(This used to be commit 1f605fe77c
)
This commit is contained in:
parent
cea6fd0b0a
commit
80087e6cfe
@ -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;
|
||||
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user