Changeset 3a3863e for message.c

Timestamp:

Mar 24, 2011, 5:00:34 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

fe3b017

Parents:

4e29ecb

Message:

Correctly compute the realm for outgoing messages

In particular, :zwrite user -r EXAMPLE.COM was not computing a recipient
of user@EXAMPLE.COM correctly. We also do not correctly set the realm on
the message: the realm attribute is the realm to which the zephyr was
sent.

File:

• message.c (modified) (1 diff)

message.c

@@ -961 +961 @@
   owl_message_set_instance(m, owl_zwrite_get_instance(z));
   if (recip_index < owl_zwrite_get_numrecips(z)) {
-    char *longzuser = long_zuser(owl_zwrite_get_recip_n(z, recip_index));
+    char *zuser = owl_zwrite_get_recip_n_with_realm(z, recip_index);
+    char *longzuser = long_zuser(zuser);
     owl_message_set_recipient(m, longzuser);
+    owl_message_set_realm(m, zuser_realm(longzuser));
     g_free(longzuser);
+    g_free(zuser);
+  } else {
+    /* TODO: We should maybe munge this into the case above, as that comparison
+     * is a little overly clever. It's also not clear this codepath ever runs
+     * anyway. */
+    const char *realm = owl_zwrite_get_realm(z);
+    owl_message_set_realm(m, realm[0] ? realm : owl_zephyr_get_realm());
   }
   owl_message_set_opcode(m, owl_zwrite_get_opcode(z));
-  owl_message_set_realm(m, owl_zwrite_get_realm(z)); /* also a hack, but not here */
 
   /* Although not strictly the zwriteline, anyone using the unsantized version