Changeset f7c0730 for zephyr.c

Timestamp:

Jan 23, 2012, 6:41:23 PM (13 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10, release-1.9

Children:

f183917

Parents:

9d206c6

git-author:

Anders Kaseorg <andersk@mit.edu> (10/22/11 21:28:36)

git-committer:

Anders Kaseorg <andersk@mit.edu> (01/23/12 18:41:23)

Message:

Append the realm to the zsender if missing

This works around the problem where setting zsender to your username
makes outgoing zephyrs become unauthenticated.  It will also make
things less confusing on cross-realm classes with the next commit.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Reviewed-by: David Benjamin <davidben@mit.edu>

File:

• zephyr.c (modified) (3 diffs)

zephyr.c

@@ -697 +697 @@
   Code_t ret;
   ZNotice_t notice;
+  char *zsender = NULL;
     
   memset(&notice, 0, sizeof(notice));
@@ -708 +709 @@
   notice.z_class=zstr(class);
   notice.z_class_inst=zstr(instance);
-  notice.z_sender=NULL;
   if (!strcmp(recipient, "@")) {
     notice.z_recipient=zstr("");
     if (*owl_global_get_zsender(&g))
-        notice.z_sender=zstr(owl_global_get_zsender(&g));
+      notice.z_sender = zsender = long_zuser(owl_global_get_zsender(&g));
   } else {
     notice.z_recipient=zstr(recipient);
@@ -730 +730 @@
   g_free(notice.z_message);
   ZFreeNotice(&notice);
+  g_free(zsender);
   if (ret != ZERR_NONE) {
     owl_function_error("Error sending zephyr: %s", error_message(ret));