[PATCH] get rid of lib/xgssapi.h

Move contents of xgssapi.h to gssapi-client.h now that it is (almost)
concentrated in a single file.


 lib/ChangeLog       |    6 ++++++
 lib/Makefile.am     |    3 +--
 src/ChangeLog       |    6 ++++++
 src/gssapi-client.h |   25 ++++++++++++++++++++++++-
 src/server.c        |    1 -
 lib/xgssapi.h       |   30 ------------------------------
 6 files changed, 37 insertions(+), 34 deletions(-)

--- ccvs/lib/xgssapi.h
+++ /dev/null	Wed Jan  1 02:48:46 2003
@@ -1,30 +0,0 @@
-/* This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.  */
-
-/* This file performs the generic include magic necessary for using
- * cross platform gssapi which configure doesn't perform itself.
- */
-
-/* Can't include both of these headers at the same time with Solaris 7 &
- * Heimdal Kerberos 0.3.  If some system ends up requiring both, a configure
- * test like TIME_AND_SYS_TIME will probably be necessary.
- */
-#ifdef HAVE_GSSAPI_H
-# include <gssapi.h>
-#else
-/* Assume existance of this header so that the user will get an informative
- * message if HAVE_GSSAPI somehow gets defined with both headers missing.
- */
-# include <gssapi/gssapi.h>
-#endif
-#ifdef HAVE_GSSAPI_GSSAPI_GENERIC_H
-/* MIT Kerberos 5 v1.2.1 */
-# include <gssapi/gssapi_generic.h>
-#endif
--- ccvs/lib/Makefile.am~remove-xgssapi	Sat May 10 21:47:56 2003
+++ ccvs-alexm/lib/Makefile.am	Sat May 10 21:47:56 2003
@@ -83,8 +83,7 @@ libcvs_a_LIBADD = @LIBOBJS@
 EXTRA_DIST = \
 	.cvsignore \
 	ChangeLog.fsf \
-	build_lib.com \
-	xgssapi.h
+	build_lib.com
 
 # Until Automake gets its act together
 distclean-local:
--- ccvs/src/gssapi-client.h~remove-xgssapi	Sat May 10 21:47:56 2003
+++ ccvs-alexm/src/gssapi-client.h	Sat May 10 21:47:56 2003
@@ -14,7 +14,28 @@
 #ifndef GSSAPI_CLIENT_H__
 #define GSSAPI_CLIENT_H__
 
-#include "xgssapi.h"
+#ifdef HAVE_GSSAPI
+
+/* Here goes the generic include magic necessary for using
+ * cross platform gssapi which configure doesn't perform itself.
+ */
+
+/* Can't include both of these headers at the same time with Solaris 7 &
+ * Heimdal Kerberos 0.3.  If some system ends up requiring both, a configure
+ * test like TIME_AND_SYS_TIME will probably be necessary.
+ */
+#ifdef HAVE_GSSAPI_H
+# include <gssapi.h>
+#else
+/* Assume existance of this header so that the user will get an informative
+ * message if HAVE_GSSAPI somehow gets defined with both headers missing.
+ */
+# include <gssapi/gssapi.h>
+#endif
+#ifdef HAVE_GSSAPI_GSSAPI_GENERIC_H
+/* MIT Kerberos 5 v1.2.1 */
+# include <gssapi/gssapi_generic.h>
+#endif
 
 #include "socket-client.h"
 
@@ -34,5 +55,7 @@ int connect_to_gserver PROTO((cvsroot_t 
 
 extern void initialize_gssapi_buffers PROTO((struct buffer **to_server_p,
 					     struct buffer **from_server_p));
+
+#endif /* HAVE_GSSAPI */
 
 #endif
--- ccvs/src/server.c~remove-xgssapi	Sat May 10 21:47:56 2003
+++ ccvs-alexm/src/server.c	Sat May 10 21:47:56 2003
@@ -28,7 +28,6 @@
  * FIXME - They should be in a different file.
  */
 #   include <netdb.h>
-#   include "xgssapi.h"
 /* We use Kerberos 5 routines to map the GSSAPI credential to a user
    name.  */
 #   include <krb5.h>
--- ccvs/lib/ChangeLog~remove-xgssapi	Sat May 10 21:48:09 2003
+++ ccvs-alexm/lib/ChangeLog	Sat May 10 21:50:19 2003
@@ -1,3 +1,9 @@
+2003-05-10  Alexey Mahotkin  <[email protected]>
+
+	* Makefile.am: xgssapi.h is no more.
+
+	* xgssapi.h: Move its contents to src/gssapi-client.h
+
 2003-04-30  Derek Price  <[email protected]>
 
 	* Makefile.in: Regenerated.
--- ccvs/src/ChangeLog~remove-xgssapi	Sat May 10 21:48:14 2003
+++ ccvs-alexm/src/ChangeLog	Sat May 10 21:53:10 2003
@@ -1,3 +1,9 @@
+2003-05-10  Alexey Mahotkin  <[email protected]>
+
+	* gssapi-client.h: Move contents of lib/xgssapi.h here.
+
+	* server.c: xgssapi.h is no more.
+
 2003-05-09  Derek Price  <[email protected]>
 
 	* buffer.c: Reindent some compiler directives in order to make nesting

_


--alexm