From 60cd1ff0635fdeda3c5a2cafee2d9a53f82cae0d Mon Sep 17 00:00:00 2001
From: Karl Ramm <kcr@mit.edu>
Date: Sun, 15 Mar 2009 22:13:16 +0000
Subject: cmu/zwgcplus changes

---
 h/config.h.in     | 12 ++++++++++++
 h/zephyr/zephyr.h |  3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'h')

diff --git a/h/config.h.in b/h/config.h.in
index bf03675..33657b5 100644
--- a/h/config.h.in
+++ b/h/config.h.in
@@ -8,6 +8,18 @@
 /* Define to compile with Kerberos v5 support. */
 #undef HAVE_KRB5
 
+/* Define to allow users to locate themselves if they are opstaff */
+#undef OPSTAFF_LOCATE_SELF
+
+/* Define to get hm_flush restrictions in zctl */
+#undef HM_FLUSH_RESTRICT
+
+/* Define to pull in CMU zctl punt backward compat foo */
+#undef CMU_ZCTL_PUNT
+
+/* Define to enable zwgcplus support */
+#undef CMU_ZWGCPLUS
+
 /* Define to 1 if `enc_part2' is member of `krb5_ticket'. */
 #undef HAVE_KRB5_TICKET_ENC_PART2
 
diff --git a/h/zephyr/zephyr.h b/h/zephyr/zephyr.h
index a19f050..2c6a543 100644
--- a/h/zephyr/zephyr.h
+++ b/h/zephyr/zephyr.h
@@ -239,6 +239,7 @@ const char *ZCharsetToString(unsigned short charset);
 #ifdef Z_DEBUG
 void Z_debug(const char *, ...);
 #endif
+char *ZExpandRealm(char *realm);
 
 /* Compatibility */
 #define	ZNewLocateUser ZLocateUser
@@ -251,7 +252,7 @@ struct sockaddr_in ZGetDestAddr (void);
 
 
 #ifdef Z_DEBUG
-void ZSetDebug ZP((void (*)(const char *, va_list, void *), void *));
+void ZSetDebug (void (*)(const char *, va_list, void *), void *);
 #define ZSetDebug(proc,closure)    (__Z_debug_print=(proc), \
 				    __Z_debug_print_closure=(closure), \
 				    (void) 0)
-- 
cgit v1.2.3