[1674] in Moira
client changes
daemon@ATHENA.MIT.EDU (Garry Zacheiss)
Wed Sep 20 15:38:52 2000
Message-Id: <200009201938.PAA10008@sweet-transvestite.mit.edu>
To: moiradev@MIT.EDU
Date: Wed, 20 Sep 2000 15:38:49 -0400
From: Garry Zacheiss <zacheiss@MIT.EDU>
Lets you set an owner. Also fixes a long standing bug of
printing "ALL ???" instead of just "ALL" for the sub, xmt, iui, and iws
acls if they're set to "ALL".
Garry
Index: zephyr.c
===================================================================
RCS file: /afs/athena.mit.edu/astaff/project/moiradev/repository/moira/clients/moira/zephyr.c,v
retrieving revision 1.11
diff -c -r1.11 zephyr.c
*** zephyr.c 2000/01/07 21:14:06 1.11
--- zephyr.c 2000/09/20 19:27:29
***************
*** 31,40 ****
--- 31,42 ----
info[ZA_SUB_TYPE] = strdup("NONE");
info[ZA_IWS_TYPE] = strdup("NONE");
info[ZA_IUI_TYPE] = strdup("NONE");
+ info[ZA_OWNER_TYPE] = strdup("NONE");
info[ZA_XMT_ID] = strdup("");
info[ZA_SUB_ID] = strdup("");
info[ZA_IWS_ID] = strdup("");
info[ZA_IUI_ID] = strdup("");
+ info[ZA_OWNER_ID] = strdup("");
info[ZA_MODTIME] = info[ZA_MODBY] = info[ZA_MODWITH] = NULL;
info[ZA_END] = NULL;
return info;
***************
*** 71,87 ****
sprintf(buf, " Zephyr class: %s", info[ZA_CLASS]);
Put_message(buf);
sprintf(buf, "Transmit ACL: %s %s", info[ZA_XMT_TYPE],
! strcasecmp(info[ZA_XMT_TYPE], "NONE") ? info[ZA_XMT_ID] : "");
Put_message(buf);
sprintf(buf, "Subscription ACL: %s %s", info[ZA_SUB_TYPE],
! strcasecmp(info[ZA_SUB_TYPE], "NONE") ? info[ZA_SUB_ID] : "");
Put_message(buf);
sprintf(buf, "Instance Wildcard ACL: %s %s", info[ZA_IWS_TYPE],
! strcasecmp(info[ZA_IWS_TYPE], "NONE") ? info[ZA_IWS_ID] : "");
Put_message(buf);
sprintf(buf, "Instance Indentity ACL: %s %s", info[ZA_IUI_TYPE],
! strcasecmp(info[ZA_IUI_TYPE], "NONE") ? info[ZA_IUI_ID] : "");
Put_message(buf);
sprintf(buf, MOD_FORMAT, info[ZA_MODBY], info[ZA_MODTIME], info[ZA_MODWITH]);
Put_message(buf);
--- 73,92 ----
sprintf(buf, " Zephyr class: %s", info[ZA_CLASS]);
Put_message(buf);
sprintf(buf, "Transmit ACL: %s %s", info[ZA_XMT_TYPE],
! (strcasecmp(info[ZA_XMT_TYPE], "NONE") && strcasecmp(info[ZA_XMT_TYPE], "ALL")) ? info[ZA_XMT_ID] : "");
Put_message(buf);
sprintf(buf, "Subscription ACL: %s %s", info[ZA_SUB_TYPE],
! (strcasecmp(info[ZA_SUB_TYPE], "NONE") && strcasecmp(info[ZA_SUB_TYPE], "ALL")) ? info[ZA_SUB_ID] : "");
Put_message(buf);
sprintf(buf, "Instance Wildcard ACL: %s %s", info[ZA_IWS_TYPE],
! (strcasecmp(info[ZA_IWS_TYPE], "NONE") && strcasecmp(info[ZA_IWS_TYPE], "ALL")) ? info[ZA_IWS_ID] : "");
Put_message(buf);
sprintf(buf, "Instance Indentity ACL: %s %s", info[ZA_IUI_TYPE],
! (strcasecmp(info[ZA_IUI_TYPE], "NONE") && strcasecmp(info[ZA_IUI_TYPE], "ALL")) ? info[ZA_IUI_ID] : "");
Put_message(buf);
+ sprintf(buf, "Owner: %s %s", info[ZA_OWNER_TYPE],
+ (strcasecmp(info[ZA_OWNER_TYPE], "NONE") && strcasecmp(info[ZA_OWNER_TYPE], "ALL")) ? info[ZA_OWNER_ID] : "");
+ Put_message(buf);
sprintf(buf, MOD_FORMAT, info[ZA_MODBY], info[ZA_MODTIME], info[ZA_MODWITH]);
Put_message(buf);
***************
*** 151,156 ****
--- 156,170 ----
{
sprintf(buf, "Which %s: ", info[ZA_IUI_TYPE]);
if (GetValueFromUser(buf, &info[ZA_IUI_ID]) == SUB_ERROR)
+ return NULL;
+ }
+ if (GetTypeFromUser("What kind of Administrator", "ace_type",
+ &info[ZA_OWNER_TYPE]) == SUB_ERROR)
+ return NULL;
+ if (strcasecmp(info[ZA_OWNER_TYPE], "NONE"))
+ {
+ sprintf(buf, "Which %s: ", info[ZA_OWNER_TYPE]);
+ if (GetValueFromUser(buf, &info[ZA_OWNER_ID]) == SUB_ERROR)
return NULL;
}
FreeAndClear(&info[ZA_MODTIME], TRUE);
