[1685] in Moira
stella patch
daemon@ATHENA.MIT.EDU (Nickolai Zeldovich)
Wed Oct 18 16:10:03 2000
Message-Id: <200010182009.QAA01446@pepsi.mit.edu>
To: moiradev@MIT.EDU
Date: Wed, 18 Oct 2000 16:09:46 -0400
From: Nickolai Zeldovich <kolya@MIT.EDU>
This patch prevents stella from defaulting to displaying the host
information if either the -addalias or -deletealias options are
specified. The current behavior can still be achieved by explicitly
asking it to print host info after updating, with the -i flag.
-- kolya
Index: stella.c
===================================================================
RCS file: /mit/moiradev/repository/moira/clients/stella/stella.c,v
retrieving revision 1.6
diff -c -r1.6 stella.c
*** stella.c 2000/09/15 06:09:43 1.6
--- stella.c 2000/10/18 20:04:02
***************
*** 50,56 ****
/* flags from command line */
int info_flag, update_flag, create_flag, delete_flag, list_map_flag;
! int update_map_flag, verbose, noauth;
struct string_list *alias_add_queue, *alias_remove_queue;
struct string_list *map_add_queue, *map_remove_queue;
--- 50,56 ----
/* flags from command line */
int info_flag, update_flag, create_flag, delete_flag, list_map_flag;
! int update_alias_flag, update_map_flag, verbose, noauth;
struct string_list *alias_add_queue, *alias_remove_queue;
struct string_list *map_add_queue, *map_remove_queue;
***************
*** 80,86 ****
/* clear all flags & lists */
info_flag = update_flag = create_flag = list_map_flag = update_map_flag = 0;
! verbose = noauth = 0;
newname = address = network = h_status = vendor = model = NULL;
os = location = contact = adm_cmt = op_cmt = NULL;
owner = NULL;
--- 80,86 ----
/* clear all flags & lists */
info_flag = update_flag = create_flag = list_map_flag = update_map_flag = 0;
! update_alias_flag = verbose = noauth = 0;
newname = address = network = h_status = vendor = model = NULL;
os = location = contact = adm_cmt = op_cmt = NULL;
owner = NULL;
***************
*** 214,219 ****
--- 214,220 ----
alias_add_queue=add_to_string_list(alias_add_queue, *arg);
} else
usage(argv);
+ update_alias_flag++;
}
else if (argis("d", "aliasdelete")) {
if (arg - argv < argc - 1) {
***************
*** 221,226 ****
--- 222,228 ----
alias_remove_queue=add_to_string_list(alias_remove_queue, *arg);
} else
usage(argv);
+ update_alias_flag++;
}
else if (argis("am", "addmap")) {
if (arg - argv < argc - 1) {
***************
*** 267,273 ****
/* default to info_flag if nothing else was specified */
if(!(info_flag || update_flag || create_flag || \
! delete_flag || list_map_flag || update_map_flag )) {
info_flag++;
}
--- 269,276 ----
/* default to info_flag if nothing else was specified */
if(!(info_flag || update_flag || create_flag || \
! delete_flag || list_map_flag || update_map_flag || \
! update_alias_flag)) {
info_flag++;
}
