CVS gsasl/lib/gssapi

[gsasl-commit]

Update of /home/cvs/gsasl/lib/gssapi
In directory dopio:/tmp/cvs-serv15260/lib/gssapi

Modified Files:
        Makefile.am client.c server.c x-gssapi.h 
Removed Files:
        shared.h 
Log Message:
Avoid use of internal.h.


--- /home/cvs/gsasl/lib/gssapi/Makefile.am      2004/09/24 14:07:38     1.6
+++ /home/cvs/gsasl/lib/gssapi/Makefile.am      2004/09/24 14:42:12     1.7
@@ -21,7 +21,7 @@
 AM_CPPFLAGS = -I$(srcdir)/../src -I../src
 
 noinst_LTLIBRARIES = libgsasl-gssapi.la
-libgsasl_gssapi_la_SOURCES = x-gssapi.h mechinfo.c shared.h
+libgsasl_gssapi_la_SOURCES = x-gssapi.h mechinfo.c
 
 if CLIENT
 libgsasl_gssapi_la_SOURCES += client.c
--- /home/cvs/gsasl/lib/gssapi/client.c 2004/09/24 14:27:35     1.5
+++ /home/cvs/gsasl/lib/gssapi/client.c 2004/09/24 14:42:12     1.6
@@ -20,9 +20,35 @@
  *
  */
 
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+/* Get malloc, free. */
+#include <stdlib.h>
+
+/* Get memcpy, strlen. */
+#include <string.h>
+
+/* Get specification. */
 #include "x-gssapi.h"
 
-#include "shared.h"
+#ifdef USE_GSS
+# include <gss.h>
+#elif HAVE_GSSAPI_H            /* Heimdal GSSAPI */
+# include <gssapi.h>
+#else /* MIT GSSAPI */
+# ifdef HAVE_GSSAPI_GSSAPI_H
+#  include <gssapi/gssapi.h>
+# endif
+# ifdef HAVE_GSSAPI_GSSAPI_GENERIC_H
+#  include <gssapi/gssapi_generic.h>
+# endif
+#endif
+
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
 
 struct _Gsasl_gssapi_client_state
 {
--- /home/cvs/gsasl/lib/gssapi/server.c 2004/09/24 14:27:35     1.3
+++ /home/cvs/gsasl/lib/gssapi/server.c 2004/09/24 14:42:12     1.4
@@ -20,9 +20,35 @@
  *
  */
 
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+/* Get malloc, free. */
+#include <stdlib.h>
+
+/* Get memcpy, strlen. */
+#include <string.h>
+
+/* Get specification. */
 #include "x-gssapi.h"
 
-#include "shared.h"
+#ifdef USE_GSS
+# include <gss.h>
+#elif HAVE_GSSAPI_H            /* Heimdal GSSAPI */
+# include <gssapi.h>
+#else /* MIT GSSAPI */
+# ifdef HAVE_GSSAPI_GSSAPI_H
+#  include <gssapi/gssapi.h>
+# endif
+# ifdef HAVE_GSSAPI_GSSAPI_GENERIC_H
+#  include <gssapi/gssapi_generic.h>
+# endif
+#endif
+
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
 
 struct _Gsasl_gssapi_server_state
 {
--- /home/cvs/gsasl/lib/gssapi/x-gssapi.h       2004/09/24 14:27:35     1.10
+++ /home/cvs/gsasl/lib/gssapi/x-gssapi.h       2004/09/24 14:42:12     1.11
@@ -23,7 +23,7 @@
 #ifndef X_GSSAPI_H
 #define X_GSSAPI_H
 
-#include "internal.h"
+#include <gsasl.h>
 
 #define GSASL_GSSAPI_NAME "GSSAPI"