summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jeffrey Hutzelman <jhutz@cmu.edu>2013-02-21 23:07:36 -0500
committerGravatar Karl Ramm <kcr@1ts.org>2013-02-26 23:01:10 -0500
commitd2b1791a3b05d3ed0b03dcb87c6ea729a99f0ceb (patch)
treef364a4b379600a9e594f879a03d22b8974e1f87f
parentdfee20f45922c8d804d7fd180d69716c6ca982ed (diff)
Make OPSTAFF_VIS actually visible to opstaff
This fixes #101
-rw-r--r--server/uloc.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/server/uloc.c b/server/uloc.c
index a85df05..000a7c6 100644
--- a/server/uloc.c
+++ b/server/uloc.c
@@ -848,6 +848,7 @@ ulogin_marshal_locs(ZNotice_t *notice,
int i = 0;
String *inst;
int local = (auth && realm_sender_in_realm(ZGetRealm(), notice->z_sender));
+ int opstaff = (auth && opstaff_check(notice->z_sender));
*found = 0; /* # of matches */
@@ -862,8 +863,10 @@ ulogin_marshal_locs(ZNotice_t *notice,
/* these locations match */
switch (locations[i].exposure) {
case OPSTAFF_VIS:
- i++;
- continue;
+ if (!opstaff) {
+ i++;
+ continue;
+ }
case REALM_VIS:
case REALM_ANN:
if (!local) {