summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEzra Peisach <epeisach@mit.edu>2003-03-09 00:22:12 +0000
committerEzra Peisach <epeisach@mit.edu>2003-03-09 00:22:12 +0000
commitc9ac1a0f95653dbbcb12fa6d2a06de7572d53cdd (patch)
tree8ec855841a47437679e997aeb8b5635000d9c0dc /src
parent492f3131cb52289e3be1eda590d87aa8c6d441a7 (diff)
downloadkrb5-c9ac1a0f95653dbbcb12fa6d2a06de7572d53cdd.tar.gz
krb5-c9ac1a0f95653dbbcb12fa6d2a06de7572d53cdd.tar.xz
krb5-c9ac1a0f95653dbbcb12fa6d2a06de7572d53cdd.zip
* t_kerb.c: Only include krb.h if krb4 support compiled in,
otherwise define ANAME_SZ, INST_SZ and REALM_SZ. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15271 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/lib/krb5/krb/ChangeLog5
-rw-r--r--src/lib/krb5/krb/t_kerb.c7
2 files changed, 12 insertions, 0 deletions
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 852969dad4..c936ca4fd6 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-08 Ezra Peisach <epeisach@mit.edu>
+
+ * t_kerb.c: Only include krb.h if krb4 support compiled in,
+ otherwise define ANAME_SZ, INST_SZ and REALM_SZ.
+
2003-03-06 Tom Yu <tlyu@mit.edu>
* preauth2.c (pa_sam_2): Add intermediate size_t variable to hold
diff --git a/src/lib/krb5/krb/t_kerb.c b/src/lib/krb5/krb/t_kerb.c
index c63cd14522..72c0a425b3 100644
--- a/src/lib/krb5/krb/t_kerb.c
+++ b/src/lib/krb5/krb/t_kerb.c
@@ -4,7 +4,9 @@
*/
#include "krb5.h"
+#ifdef KRB5_KRB4_COMPAT
#include "kerberosIV/krb.h"
+#endif
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@@ -65,6 +67,11 @@ void test_524_conv_principal(krb5_context ctx, char *name)
{
krb5_principal princ = 0;
krb5_error_code retval;
+#ifndef KRB5_KRB4_COMPAT
+#define ANAME_SZ 40
+#define INST_SZ 40
+#define REALM_SZ 40
+#endif
char aname[ANAME_SZ+1], inst[INST_SZ+1], realm[REALM_SZ+1];
aname[ANAME_SZ] = inst[INST_SZ] = realm[REALM_SZ] = 0;