Changeset c855755 for zephyr.c

Timestamp:

Jul 16, 2011, 12:31:32 AM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

5b24dc0

Parents:

2770be99

git-author:

David Benjamin <davidben@mit.edu> (07/12/11 11:45:12)

git-committer:

David Benjamin <davidben@mit.edu> (07/16/11 00:31:32)

Message:

Suppress ZERR_INTERNAL from ZSetLocation for pre-3.0 zephyr

If you are subbed to your own login notifications, ZSetLocation will
wait for the wrong notice and return a spurious ZERR_INTERNAL.
Fortunately, from the debian/changelog, this was fixed right near the
boundary between 2.0 and 3.0, so we can suppress it for the old ABI.

File:

• zephyr.c (modified) (1 diff)

zephyr.c

@@ -1231 +1231 @@
     return -1;
   ret = ZSetLocation(zstr(exposure));
-  if (ret != ZERR_NONE) {
+  if (ret != ZERR_NONE
+#ifdef ZCONST
+      /* Before zephyr 3.0, ZSetLocation had a bug where, if you were subscribed
+       * to your own logins, it could wait for the wrong notice and return
+       * ZERR_INTERNAL when found neither SERVACK nor SERVNAK. Suppress it when
+       * building against the old ABI. */
+      && ret != ZERR_INTERNAL
+#endif
+     ) {
     owl_function_error("Unable to set exposure level: %s.", error_message(ret));
     return -1;