Changeset 5d56a27 for zephyr.c

Timestamp:

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

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

4e29ecb

Parents:

3f52e14

Message:

Handle edge cases correctly in long_zuser and short_zuser

foo@bar@REALM and foo@ were not correctly parsed. (The former should be
foo@bar [at] REALM and the latter is implicitly foo [at] DEFAULT-REALM.)

File:

• zephyr.c (modified) (2 diffs)

zephyr.c

@@ -1167 +1167 @@
 char *short_zuser(const char *in)
 {
-  char *out, *ptr;
-
-  out=g_strdup(in);
-  ptr=strchr(out, '@');
-  if (ptr) {
-    if (!strcasecmp(ptr+1, owl_zephyr_get_realm())) {
-      *ptr='\0';
-    }
-  }
-  return(out);
+  char *ptr = strrchr(in, '@');
+  if (ptr && (ptr[1] == '\0' || !strcasecmp(ptr+1, owl_zephyr_get_realm()))) {
+    return g_strndup(in, ptr - in);
+  }
+  return g_strdup(in);
 }
 
@@ -1184 +1179 @@
 char *long_zuser(const char *in)
 {
-  if (strchr(in, '@')) {
-    return(g_strdup(in));
-  }
-  return(g_strdup_printf("%s@%s", in, owl_zephyr_get_realm()));
+  char *ptr = strrchr(in, '@');
+  if (ptr) {
+    if (ptr[1])
+      return g_strdup(in);
+    /* Ends in @, so assume default realm. */
+    return g_strdup_printf("%s%s", in, owl_zephyr_get_realm());
+  }
+  return g_strdup_printf("%s@%s", in, owl_zephyr_get_realm());
 }