struct krb_principal lossage

[Love]

John Hawkinson <jhawk at MIT.EDU> writes:

> It'd be nice if rxkad/ didn't depend on it.
> Of course, since rxkad/ came from kth-krb, I recognize this
> might be a bit difficult.

There is this file stds.h where we add all things that might
be incompatible with the kth-krb distribution. 
(like int32_t & friends)

> Otherwise, I suppose autoconf should look and declare it
> elsewhere...dunno what the best way to handle this is.

Is this enougth ?

Love

diff -u -w -r1.78 -r1.79
--- configure.in        1998/03/02 13:46:14     1.78
+++ configure.in        1998/03/02 14:57:10     1.79
@@ -204,6 +204,23 @@
 fi
 
 CFLAGS="-I../include $CFLAGS"
+
+dnl
+dnl Check for struct krb_principal
+dnl
+
+AC_CACHE_CHECK(krb_principal, ac_cv_struct_krb_principal, [
+if test ! $with_krb4 = "no"; then
+AC_EGREP_HEADER(krb_principal, krb.h,ac_cv_struct_krb_principal=yes)
+eval "ac_cv_struct_krb_principal=${ac_cv_struct_krb_principal-no}"
+else
+dnl Gross hack to avoid struct krb_principal get defined when we doesn't have krb
+eval "ac_cv_struct_krb_principal=no"
+fi
+])
+if test "$ac_cv_struct_krb_principal" = "yes"; then
+  AC_DEFINE(HAVE_KRB_PRINCIPAL)
+fi
diff -u -w -r1.15 acconfig.h
--- acconfig.h  1998/02/23 04:07:27     1.15
+++ acconfig.h  1998/03/02 15:02:54
@@ -157,3 +157,6 @@
 
 /* we always have stds.h */
 #define HAVE_STDS_H
+
+/* We have krb_principal from kth-krb ? */
+#undef HAVE_KRB_PRINCIPAL
--- stds.h   1998/03/02 13:14:52     1.1
+++ stds.h   1998/03/02 14:58:06     1.2
@@ -47,6 +47,15 @@
 
 #ifndef HAVE_U_INT32
 typedef u_int32_t u_int32;
+#endif
+
+/* for compat resons with other kerberos distributions */
+#ifndef HAVE_KRB_PRINCIPAL 
+typedef struct krb_principal{
+    char name[ANAME_SZ];
+    char instance[INST_SZ];
+    char realm[REALM_SZ];
+}krb_principal;
 #endif
 
 #endif /* __STDS_H */