Changeset f12d199


Ignore:
Timestamp:
Aug 8, 2009, 3:12:04 AM (12 years ago)
Author:
Geoffrey Thomas <geofft@mit.edu>
Branches:
master, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9
Children:
fea7992
Parents:
2c14f40
Message:
Revert "owl_function_info: Explain the auth status better."

Unfortunately this code breaks if not HAVE_LIBZEPHYR.

This reverts commit 2c14f4049d15e5dff469ded00dfd28a0947b423e.
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • functions.c

    r2c14f40 rf12d199  
    14901490        owl_fmtext_append_normal(&fm, "\n");
    14911491        owl_fmtext_appendf_normal(&fm, "  Port      : %i\n", ntohs(n->z_port));
    1492         owl_fmtext_appendf_normal(&fm, "  Auth Tried: %s\n", owl_zephyr_get_authstr(n->z_auth));
     1492        owl_fmtext_appendf_normal(&fm, "  Auth      : %s\n", owl_zephyr_get_authstr(n));
    14931493
    14941494        /* FIXME make these more descriptive */
    1495         owl_fmtext_appendf_normal(&fm, "  Auth Check: %s\n", owl_zephyr_get_authstr(n->z_checked_auth));
     1495        owl_fmtext_appendf_normal(&fm, "  Checkd Ath: %i\n", n->z_checked_auth);
    14961496        owl_fmtext_appendf_normal(&fm, "  Multi notc: %s\n", n->z_multinotice);
    14971497        owl_fmtext_appendf_normal(&fm, "  Num other : %i\n", n->z_num_other_fields);
  • perlconfig.c

    r2c14f40 rf12d199  
    5858
    5959    (void)hv_store(h, "auth", strlen("auth"),
    60                    newSVpv(owl_zephyr_get_authstr(owl_message_get_notice(m)->z_checked_auth),0),0);
     60                   newSVpv(owl_zephyr_get_authstr(owl_message_get_notice(m)),0),0);
    6161  }
    6262
  • zephyr.c

    r2c14f40 rf12d199  
    10761076/* return auth string */
    10771077#ifdef HAVE_LIBZEPHYR
    1078 char *owl_zephyr_get_authstr(int a)
    1079 {
    1080 
    1081   if (a == ZAUTH_FAILED) {
     1078char *owl_zephyr_get_authstr(ZNotice_t *n)
     1079{
     1080
     1081  if (!n) return("UNKNOWN");
     1082
     1083  if (n->z_auth == ZAUTH_FAILED) {
    10821084    return ("FAILED");
    1083   } else if (a == ZAUTH_NO) {
     1085  } else if (n->z_auth == ZAUTH_NO) {
    10841086    return ("NO");
    1085   } else if (a == ZAUTH_YES) {
     1087  } else if (n->z_auth == ZAUTH_YES) {
    10861088    return ("YES");
    10871089  } else {
    10881090    return ("UNKNOWN");
    1089   }
     1091  }           
    10901092}
    10911093#else
Note: See TracChangeset for help on using the changeset viewer.