propagate consting of ZGetRealm

git-svn-id: svn://svn.1ts.org/debian/branches/zephyr-reloaded@384 cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f

diff --git a/zephyr/server/dispatch.c b/zephyr/server/dispatch.c
index 28d39ecbd48d032b6e575b6ab8af9d12c5fa6c4d..ee67ae5a9b20f211de91b4c996b4d9eb9bc47c14 100644 (file)
--- a/zephyr/server/dispatch.c
+++ b/zephyr/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/zephyr/server/realm.c b/zephyr/server/realm.c
index 34a41af3fcdbdfe6b8c72d9d42883946963fff95..110125ed7b73ed5d9bf08353aa7bb111cdf0789f 100644 (file)
--- a/zephyr/server/realm.c
+++ b/zephyr/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/zephyr/server/zserver.h b/zephyr/server/zserver.h
index 5cfc66e1ba1e7fe7150b24bd337caaa808e4a130..078a8a7df30c56f1c8a6e2072f12e081f19ab2b5 100644 (file)
--- a/zephyr/server/zserver.h
+++ b/zephyr/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/zephyr/zwgc/zephyr.c b/zephyr/zwgc/zephyr.c
index f672d849ae5ef51930fee40583104385eb9ef5f2..a2f97510477063610b4fea2e91e238b4ec465957 100644 (file)
--- a/zephyr/zwgc/zephyr.c
+++ b/zephyr/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());
 
     /*