diff options
| -rw-r--r-- | server/dispatch.c | 2 | ||||
| -rw-r--r-- | server/realm.c | 6 | ||||
| -rw-r--r-- | server/zserver.h | 6 | ||||
| -rw-r--r-- | zwgc/zephyr.c | 3 |
4 files changed, 9 insertions, 8 deletions
diff --git a/server/dispatch.c b/server/dispatch.c index 912ffcd..bb7fee9 100644 --- a/server/dispatch.c +++ b/server/dispatch.c @@ -1250,7 +1250,7 @@ hm_recipient(void) if (recipient) return recipient; - realm = ZGetRealm(); + realm = (char *)ZGetRealm(); if (!realm) realm = "???"; recipient = (char *) malloc(strlen(realm) + 4); diff --git a/server/realm.c b/server/realm.c index 34a41af..110125e 100644 --- a/server/realm.c +++ b/server/realm.c @@ -88,7 +88,7 @@ realm_get_idx_by_addr(ZRealm *realm, return 0; } -char * +const char * realm_expand_realm(char *realmname) { ZRealm *realm; @@ -240,7 +240,7 @@ realm_send_realms(void) } int -realm_bound_for_realm(char *realm, char *recip) +realm_bound_for_realm(const char *realm, char *recip) { char *rlm = NULL; int remote = strcmp(ZGetRealm(), realm); @@ -258,7 +258,7 @@ realm_bound_for_realm(char *realm, char *recip) } int -realm_sender_in_realm(char *realm, char *sender) +realm_sender_in_realm(const char *realm, char *sender) { char *rlm = NULL; int remote = strcmp(ZGetRealm(), realm); diff --git a/server/zserver.h b/server/zserver.h index 887097a..cceb270 100644 --- a/server/zserver.h +++ b/server/zserver.h @@ -357,13 +357,13 @@ void ulogin_relay_locate(ZNotice_t *, struct sockaddr_in *); void ulogin_realm_locate(ZNotice_t *, struct sockaddr_in *, ZRealm *); /* found in realm.c */ -int realm_sender_in_realm(char *realm, char *sender); -int realm_bound_for_realm(char *realm, char *recip); +int realm_sender_in_realm(const char *realm, char *sender); +int realm_bound_for_realm(const char *realm, char *recip); ZRealm *realm_which_realm(struct sockaddr_in *who); ZRealm *realm_get_realm_by_name(char *name); ZRealm *realm_get_realm_by_pid(int); void realm_handoff(ZNotice_t *, int, struct sockaddr_in *, ZRealm *, int); -char *realm_expand_realm(char *); +const char *realm_expand_realm(char *); void realm_init(void); Code_t ZCheckZRealmAuthentication(ZNotice_t *, struct sockaddr_in *, char *); diff --git a/zwgc/zephyr.c b/zwgc/zephyr.c index f672d84..a2f9751 100644 --- a/zwgc/zephyr.c +++ b/zwgc/zephyr.c @@ -193,7 +193,8 @@ void zephyr_init(void (*notice_handler)(ZNotice_t *)) /* * Set $realm to our realm and $user to our zephyr username: */ - var_set_variable("realm", ZGetRealm()); + var_set_variable("realm", (char *)ZGetRealm()); /* XXX should propagate the + * const */ var_set_variable("user", ZGetSender()); /* |