} else
usage(argv);
}
- else if (argis("a", "aliasadd")) {
+ else if (argis("a", "addalias")) {
if (arg - argv < argc - 1) {
arg++;
alias_add_queue=add_to_string_list(alias_add_queue, *arg);
usage(argv);
update_alias_flag++;
}
- else if (argis("d", "aliasdelete")) {
+ else if (argis("d", "deletealias")) {
if (arg - argv < argc - 1) {
arg++;
alias_remove_queue=add_to_string_list(alias_remove_queue, *arg);
status = mrcl_validate_kerberos_member(argv[13], &argv[13]);
if (mrcl_get_message())
mrcl_com_err(whoami);
+ if (status == MRCL_REJECT)
+ exit(1);
status = wrap_mr_query("add_host", 16, argv, NULL, NULL);
break;
status = mrcl_validate_kerberos_member(argv[14], &argv[14]);
if (mrcl_get_message())
mrcl_com_err(whoami);
+ if (status == MRCL_REJECT)
+ exit(1);
status = wrap_mr_query("update_host", 17, argv, NULL, NULL);
break;
args[0] = canonicalize_hostname(strdup(hostname));
args[1] = args[2] = args[3] = "*";
status = wrap_mr_query("get_host", 4, args, store_host_info, argv);
+
+ /* We might be looking for an alias of a deleted host. */
+ if (status && status == MR_NO_MATCH) {
+ status = wrap_mr_query("get_hostalias", 2, args, store_host_info, argv);
+ if (!status) {
+ args[0] = strdup(argv[1]);
+ status = wrap_mr_query("get_host", 4, args, store_host_info, argv);
+ }
+ }
+
if (status) {
com_err(whoami, status, "while getting host information");
exit(1);
}
+
if (unformatted_flag)
show_host_info_unformatted(argv);
else