Changeset fe3b017

Timestamp:

Mar 24, 2011, 5:14:41 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

1a30f05

Parents:

3a3863e

Message:

Correctly set the realm in outgoing zwrite errors

Don't set the zwrite realm, as that only confuses things. Also take the
realm (which we now don't set) into account when extracting the
recipient.

Files:

• logging.c (modified) (2 diffs)
• zephyr.c (modified) (1 diff)

logging.c

@@ -179 +179 @@
   FILE *file;
   char *filename, *logpath;
-  char *tobuff;
+  char *tobuff, *recip;
   owl_message *m;
 
@@ -195 +195 @@
 
   /* chop off a local realm */
-  tobuff = short_zuser(owl_list_get_element(&(zw->recips), 0));
+  recip = owl_zwrite_get_recip_n_with_realm(zw, 0);
+  tobuff = short_zuser(recip);
+  g_free(recip);
 
   /* expand ~ in path names */

zephyr.c

@@ -803 +803 @@
       zw.class = g_strdup(retnotice->z_class);
       zw.inst  = g_strdup(retnotice->z_class_inst);
-      zw.realm = g_strdup(zuser_realm(retnotice->z_recipient));
+      zw.realm = g_strdup("");
       zw.opcode = g_strdup(retnotice->z_opcode);
       zw.zsig   = g_strdup("");
       owl_list_create(&(zw.recips));
-      owl_list_append_element(&(zw.recips), g_strdup(tmp));
+      owl_list_append_element(&(zw.recips), g_strdup(retnotice->z_recipient));
 
       owl_log_outgoing_zephyr_error(&zw, buff);