Changeset fe3b017


Ignore:
Timestamp:
Mar 24, 2011, 5:14:41 PM (13 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:
2 edited

Legend:

Unmodified
Added
Removed
  • logging.c

    re5da3fe rfe3b017  
    179179  FILE *file;
    180180  char *filename, *logpath;
    181   char *tobuff;
     181  char *tobuff, *recip;
    182182  owl_message *m;
    183183
     
    195195
    196196  /* chop off a local realm */
    197   tobuff = short_zuser(owl_list_get_element(&(zw->recips), 0));
     197  recip = owl_zwrite_get_recip_n_with_realm(zw, 0);
     198  tobuff = short_zuser(recip);
     199  g_free(recip);
    198200
    199201  /* expand ~ in path names */
  • zephyr.c

    r4e29ecb rfe3b017  
    803803      zw.class = g_strdup(retnotice->z_class);
    804804      zw.inst  = g_strdup(retnotice->z_class_inst);
    805       zw.realm = g_strdup(zuser_realm(retnotice->z_recipient));
     805      zw.realm = g_strdup("");
    806806      zw.opcode = g_strdup(retnotice->z_opcode);
    807807      zw.zsig   = g_strdup("");
    808808      owl_list_create(&(zw.recips));
    809       owl_list_append_element(&(zw.recips), g_strdup(tmp));
     809      owl_list_append_element(&(zw.recips), g_strdup(retnotice->z_recipient));
    810810
    811811      owl_log_outgoing_zephyr_error(&zw, buff);
Note: See TracChangeset for help on using the changeset viewer.