1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00

merge from tridge

(This used to be ctdb commit edf6b476f995737fdaa8ce6b053d63286e49ced3)
This commit is contained in:
Ronnie Sahlberg 2007-07-05 10:01:35 +10:00
commit 8df14ced22

View File

@ -316,7 +316,7 @@ static int kill_tcp(struct ctdb_context *ctdb, int argc, const char **argv)
}
if (!parse_ip_port(argv[0], &src)) {
printf("Bad IP:port '%s'\n", argv[1]);
printf("Bad IP:port '%s'\n", argv[0]);
return -1;
}
@ -350,7 +350,7 @@ static int tickle_tcp(struct ctdb_context *ctdb, int argc, const char **argv)
}
if (!parse_ip_port(argv[0], &src)) {
printf("Bad IP:port '%s'\n", argv[1]);
printf("Bad IP:port '%s'\n", argv[0]);
return -1;
}
@ -907,7 +907,7 @@ static void usage(void)
" -t <timelimit> set timelimit for control in seconds (default %u)\n", options.timelimit);
printf("Controls:\n");
for (i=0;i<ARRAY_SIZE(ctdb_commands);i++) {
printf(" %-15s %-20s %s\n",
printf(" %-15s %-27s %s\n",
ctdb_commands[i].name,
ctdb_commands[i].args?ctdb_commands[i].args:"",
ctdb_commands[i].msg);