Changeset 32ad44d

Timestamp:

Oct 4, 2009, 12:18:45 AM (15 years ago)

Author:

Nelson Elhage <nelhage@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:

3b80321

Parents:

6f0fbe9

Message:

Don't call any libzephyr functions before ZInitialize().

With krb5 Zephyr, calling e.g. ZGetSender() before ZInitialize() not
only doesn't work, but breaks libzephyr. Make sure that no code can
call Zephyr accessors before we call ZInitialize.

File:

• zephyr.c (modified) (4 diffs)

zephyr.c

@@ -172 +172 @@
   }
 #endif
-  return(0);
+  return 0;
 }
 
@@ -180 +180 @@
   if(owl_global_is_havezephyr(&g))
     return(ZPending());
-  else
-    return 0;
-#else
-  return(0);
-#endif
+#endif
+  return 0;
 }
 
@@ -190 +187 @@
 {
 #ifdef HAVE_LIBZEPHYR
-  return(ZGetRealm());
-#else
-  return("");
-#endif
+  if (owl_global_is_havezephyr(&g))
+    return(ZGetRealm());
+#endif
+  return "";
 }
 
@@ -199 +196 @@
 {
 #ifdef HAVE_LIBZEPHYR
-  return(ZGetSender());
-#else
-  return("");
-#endif
+  if (owl_global_is_havezephyr(&g))
+    return(ZGetSender());
+#endif
+  return "";
 }