Proposed patch for /usr/include/gssapi.h

Russ Allbery rra at stanford.edu
Wed Sep 27 22:32:05 EDT 2006


One of the annoying little incompatibilities between MIT Kerberos and
Heimdal for some time has been that MIT Kerberos expects one to include
<gssapi/gssapi.h>, but Heimdal expects one to include <gssapi.h>.  After
a Debian bug report about this and some discussion on Zephyr, I'd like to
propose the following patch.

This installs a gssapi.h wrapper that just includes <gssapi/gssapi.h> so
that either form will work.

Thoughts?  Approval?  This is RT 2240.

Index: src/include/Makefile.in
===================================================================
--- src/include/Makefile.in	(revision 18630)
+++ src/include/Makefile.in	(working copy)
@@ -126,3 +126,4 @@
 	$(INSTALL_DATA) krb5/krb5.h $(DESTDIR)$(KRB5_INCDIR)$(S)krb5$(S)krb5.h
 	$(INSTALL_DATA) $(srcdir)/krb5/locate_plugin.h $(DESTDIR)$(KRB5_INCDIR)$(S)krb5$(S)locate_plugin.h
 	$(INSTALL_DATA) profile.h $(DESTDIR)$(KRB5_INCDIR)$(S)profile.h
+	$(INSTALL_DATA) $(srcdir)/gssapi.h $(DESTDIR)$(KRB5_INCDIR)$(S)gssapi.h
Index: src/include/gssapi.h
===================================================================
--- src/include/gssapi.h	(revision 0)
+++ src/include/gssapi.h	(revision 0)
@@ -0,0 +1,5 @@
+/* 
+ * Wrapper so that #include <gssapi.h> will work without special include
+ * paths.
+ */
+#include <gssapi/gssapi.h>

-- 
Russ Allbery (rra at stanford.edu)             <http://www.eyrie.org/~eagle/>



More information about the krbdev mailing list