diff options
| author |  Karl Ramm <kcr@mit.edu> | 2007-12-25 00:56:08 +0000 |
|---|---|---|
| committer | Karl Ramm <kcr@mit.edu> | 2007-12-25 00:56:08 +0000 |
| commit | 1a0e03eb19998ab496a6ea845ff2c42d9a02df0b (patch) | |
| tree | 29b47c8532e1f1678063fbb1b851ee4208134626 /server/uloc.c | |
| parent | 3f120f880be9ae9aa1612ddc2412e9acb9a8e85e (diff) | |
applied athena-update-branch patch
Diffstat (limited to 'server/uloc.c')
| -rw-r--r-- | server/uloc.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/server/uloc.c b/server/uloc.c index 0d7ea8e..66071cf 100644 --- a/server/uloc.c +++ b/server/uloc.c @@ -106,7 +106,7 @@ static int ul_equiv __P((Location *l1, Location *l2)); static void free_loc __P((Location *loc)); static void ulogin_locate_forward __P((ZNotice_t *notice, - struct sockaddr_in *who, Realm *realm)); + struct sockaddr_in *who, ZRealm *realm)); static Location *locations = NULL; /* ptr to first in array */ static int num_locs = 0; /* number in array */ @@ -241,7 +241,11 @@ ulogin_dispatch(notice, auth, who, server) login_sendit(notice, auth, who, 1); } } else { - syslog(LOG_ERR, "unknown ulog opcode %s", notice->z_opcode); + if (!strcmp(notice->z_opcode, LOGIN_USER_LOGIN)) + zdbug((LOG_DEBUG, "ulog opcode from unknown foreign realm %s", + notice->z_opcode)); + else + syslog(LOG_ERR, "unknown ulog opcode %s", notice->z_opcode); if (server == me_server) nack(notice, who); return ZERR_NONE; @@ -282,7 +286,7 @@ ulocate_dispatch(notice, auth, who, server) Server *server; { char *cp; - Realm *realm; + ZRealm *realm; if (!strcmp(notice->z_opcode, LOCATE_LOCATE)) { /* we are talking to a current-rev client; send an ack */ @@ -294,7 +298,7 @@ ulocate_dispatch(notice, auth, who, server) ulogin_locate(notice, who, auth); return ZERR_NONE; } else { - syslog(LOG_ERR, "unknown uloc opcode %s", notice->z_opcode); + syslog(LOG_ERR, "unknown uloc opcode %s", notice->z_opcode); if (server == me_server) nack(notice, who); return ZERR_NONE; @@ -441,6 +445,7 @@ uloc_send_locations() default: syslog(LOG_ERR,"broken location state %s/%d", loc->user->string, (int) loc->exposure); + exposure_level = EXPOSE_OPSTAFF; break; } retval = bdump_send_list_tcp(ACKED, &loc->addr, LOGIN_CLASS, @@ -1004,7 +1009,7 @@ static void ulogin_locate_forward(notice, who, realm) ZNotice_t *notice; struct sockaddr_in *who; - Realm *realm; + ZRealm *realm; { ZNotice_t lnotice; @@ -1018,7 +1023,7 @@ void ulogin_realm_locate(notice, who, realm) ZNotice_t *notice; struct sockaddr_in *who; - Realm *realm; + ZRealm *realm; { char **answer; int found; |