Changeset 4e29ecb

Timestamp:

Mar 24, 2011, 4:56:24 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

3a3863e

Parents:

5d56a27

Message:

Add zuser_realm and use it

We do not consistently (or correctly) extract the realm from a zuser.
Add a function and use it instead of ad-hoc strchr munging.

Files:

• message.c (modified) (4 diffs)
• zephyr.c (modified) (3 diffs)

message.c

@@ -775 +775 @@
   struct hostent *hent;
 #endif /* ZNOTICE_SOCKADDR */
-  const char *ptr;
   char *tmp, *tmp2;
   int len;
@@ -808 +807 @@
   owl_message_set_zsig(m, owl_zephyr_get_zsig(n, &len));
 
-  if ((ptr=strchr(n->z_recipient, '@'))!=NULL) {
-    owl_message_set_realm(m, ptr+1);
-  } else {
-    owl_message_set_realm(m, owl_zephyr_get_realm());
-  }
+  owl_message_set_realm(m, zuser_realm(n->z_recipient));
 
   /* Set the "isloginout" attribute if it's a login message */
@@ -915 +910 @@
 {
   char *longuser;
-  const char *ptr;
 
 #ifdef HAVE_LIBZEPHYR
@@ -944 +938 @@
   }
 
-  if ((ptr=strchr(longuser, '@'))!=NULL) {
-    owl_message_set_realm(m, ptr+1);
-  } else {
-    owl_message_set_realm(m, owl_zephyr_get_realm());
-  }
+  owl_message_set_realm(m, zuser_realm(longuser));
 
   owl_message_set_body(m, "<uninitialized>");

zephyr.c

@@ -771 +771 @@
       char *buff;
       owl_zwrite zw;
-      char *realm;
 
       tmp = short_zuser(retnotice->z_recipient);
@@ -804 +803 @@
       zw.class = g_strdup(retnotice->z_class);
       zw.inst  = g_strdup(retnotice->z_class_inst);
-      realm = strchr(retnotice->z_recipient, '@');
-      if(realm) {
-        zw.realm = g_strdup(realm + 1);
-      } else {
-        zw.realm = g_strdup(owl_zephyr_get_realm());
-      }
+      zw.realm = g_strdup(zuser_realm(retnotice->z_recipient));
       zw.opcode = g_strdup(retnotice->z_opcode);
       zw.zsig   = g_strdup("");
@@ -1187 +1181 @@
   }
   return g_strdup_printf("%s@%s", in, owl_zephyr_get_realm());
+}
+
+/* Return the realm of the zephyr user name. Caller does /not/ free the return.
+ * The string is valid at least as long as the input is.
+ */
+const char *zuser_realm(const char *in)
+{
+  char *ptr = strrchr(in, '@');
+  /* If the name has an @ and does not end with @, use that. Otherwise, take
+   * the default realm. */
+  return (ptr && ptr[1]) ? (ptr+1) : owl_zephyr_get_realm();
 }