new constant MAX_PRINCIPAL_SIZE: what it says on the tin

define REALM_SZ based on maximum dns name when it's not; this needs to be
split from the krb4 REALM_SZ and rethought in context of MAX_PRINCIPAL_SIZE

remove prototype macro from Z_WaitForNotice.  Need to come back and do more
of that.

git-svn-id: svn://svn.1ts.org/debian/branches/zephyr-reloaded@365 cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f

diff --git a/zephyr/h/internal.h b/zephyr/h/internal.h
index ac0709987bd4f807987dc33495bcce64b5022a5f..3782a12218aed7cf12d630ba7ea81f90044bffcf 100644 (file)
--- a/zephyr/h/internal.h
+++ b/zephyr/h/internal.h
@@ -20,12 +20,15 @@
 #endif
 
 #ifndef HAVE_KRB4
-#define REALM_SZ       MAXHOSTNAMELEN
-#define INST_SZ                0               /* no instances w/o Kerberos */
-#define ANAME_SZ       9               /* size of a username + null */
 #define CLOCK_SKEW     300             /* max time to cache packet ids */
 #endif
 
+#ifndef REALM_SZ  /* XXX */
+#include <arpa/nameser.h>
+#define REALM_SZ       NS_MAXDNAME
+#endif
+#define MAX_PRINCIPAL_SIZE     1024
+
 #define SERVER_SVC_FALLBACK    htons((unsigned short) 2103)
 #define HM_SVC_FALLBACK                htons((unsigned short) 2104)
 #define HM_SRV_SVC_FALLBACK    htons((unsigned short) 2105)
@@ -109,9 +112,9 @@ Code_t Z_SendFragmentedNotice __P((ZNotice_t *notice, int len,
                                   Z_AuthProc cert_func,
                                   Z_SendProc send_func));
 Code_t Z_WaitForComplete __P((void));
-Code_t Z_WaitForNotice __P((ZNotice_t *notice,
-                           int (*pred) __P((ZNotice_t *, void *)), void *arg,
-                           int timeout));
+Code_t Z_WaitForNotice (ZNotice_t *notice,
+                       int (*pred)(ZNotice_t *, void *), void *arg,
+                       int timeout);
 
 
 Code_t Z_NewFormatHeader __P((ZNotice_t *, char *, int, int *, Z_AuthProc));