Changeset f12d199

Timestamp:

Aug 8, 2009, 3:12:04 AM (15 years ago)

Author:

Geoffrey Thomas <geofft@mit.edu>

Branches:

master, release-1.10, 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:

• functions.c (modified) (1 diff)
• perlconfig.c (modified) (1 diff)
• zephyr.c (modified) (1 diff)

functions.c

@@ -1490 +1490 @@
         owl_fmtext_append_normal(&fm, "\n");
         owl_fmtext_appendf_normal(&fm, "  Port      : %i\n", ntohs(n->z_port));
-        owl_fmtext_appendf_normal(&fm, "  Auth Tried: %s\n", owl_zephyr_get_authstr(n->z_auth));
+        owl_fmtext_appendf_normal(&fm, "  Auth      : %s\n", owl_zephyr_get_authstr(n));
 
         /* FIXME make these more descriptive */
-        owl_fmtext_appendf_normal(&fm, "  Auth Check: %s\n", owl_zephyr_get_authstr(n->z_checked_auth));
+        owl_fmtext_appendf_normal(&fm, "  Checkd Ath: %i\n", n->z_checked_auth);
         owl_fmtext_appendf_normal(&fm, "  Multi notc: %s\n", n->z_multinotice);
         owl_fmtext_appendf_normal(&fm, "  Num other : %i\n", n->z_num_other_fields);

perlconfig.c

@@ -58 +58 @@
 
     (void)hv_store(h, "auth", strlen("auth"), 
-                   newSVpv(owl_zephyr_get_authstr(owl_message_get_notice(m)->z_checked_auth),0),0);
+                   newSVpv(owl_zephyr_get_authstr(owl_message_get_notice(m)),0),0);
   }
 

zephyr.c

@@ -1076 +1076 @@
 /* return auth string */
 #ifdef HAVE_LIBZEPHYR
-char *owl_zephyr_get_authstr(int a)
-{
-
-  if (a == ZAUTH_FAILED) {
+char *owl_zephyr_get_authstr(ZNotice_t *n)
+{
+
+  if (!n) return("UNKNOWN");
+
+  if (n->z_auth == ZAUTH_FAILED) {
     return ("FAILED");
-  } else if (a == ZAUTH_NO) {
+  } else if (n->z_auth == ZAUTH_NO) {
     return ("NO");
-  } else if (a == ZAUTH_YES) {
+  } else if (n->z_auth == ZAUTH_YES) {
     return ("YES");
   } else {
     return ("UNKNOWN");
-  }
+  }           
 }
 #else