mechglue.h: Don't include <sys/types.h>; it's included if necessary in

	gssapi/gssapi.h.  On a Macintosh, #include gssapi.h instead of
	gssapi/gssapi.h.

g_accept_sec_context.c, g_acquire_cred.c, g_compare_name.c,
g_context_time.c, g_delete_sec_context.c, g_dsp_name.c,
g_dsp_status.c, g_exp_sec_context.c, g_glue.c, g_imp_name.c,
g_imp_sec_context.c, g_indicate_mechs.c, g_init_sec_context.c,
g_initialize.c, g_inq_context.c, g_inq_cred.c, g_inq_names.c,
g_process_context.c, g_rel_buffer.c, g_rel_cred.c, g_rel_name.c,
g_rel_oid_set.c, g_seal.c, g_sign.c, g_unseal.c, g_verify.c,
gssd_pname_to_uid.c, mechglue.h, mglueP.h: Comment out #ident line.
	This causes the Macintosh C compiler indigestion.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7685 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/gssapi/mechglue/ChangeLog b/src/lib/gssapi/mechglue/ChangeLog
index 9da259bc99ee3f17137b3b3c71d646b4e93f6d9a..e07d39cdbfb19b2b9ce169c2d2d2ccb4abdd37bf 100644 (file)
--- a/src/lib/gssapi/mechglue/ChangeLog
+++ b/src/lib/gssapi/mechglue/ChangeLog
@@ -1,3 +1,19 @@
+Wed Mar 20 20:20:38 1996  Theodore Y. Ts'o  <tytso@dcl>
+
+       * mechglue.h: Don't include <sys/types.h>; it's included if
+               necessary in gssapi/gssapi.h.  On a Macintosh, #include
+               gssapi.h instead of gssapi/gssapi.h.
+
+       * g_accept_sec_context.c, g_acquire_cred.c, g_compare_name.c,
+       g_context_time.c, g_delete_sec_context.c, g_dsp_name.c,
+       g_dsp_status.c, g_exp_sec_context.c, g_glue.c, g_imp_name.c,
+       g_imp_sec_context.c, g_indicate_mechs.c, g_init_sec_context.c,
+       g_initialize.c, g_inq_context.c, g_inq_cred.c, g_inq_names.c,
+       g_process_context.c, g_rel_buffer.c, g_rel_cred.c, g_rel_name.c,
+       g_rel_oid_set.c, g_seal.c, g_sign.c, g_unseal.c, g_verify.c,
+       gssd_pname_to_uid.c, mechglue.h, mglueP.h: Comment out #ident
+               line.  This causes the Macintosh C compiler indigestion.
+
 Tue Mar 12 23:28:57 1996  Ken Raeburn  <raeburn@cygnus.com>
 
        * mechglue.h (gssd_pname_to_uid, gss_initialize): Use PROTOTYPE

diff --git a/src/lib/gssapi/mechglue/g_accept_sec_context.c b/src/lib/gssapi/mechglue/g_accept_sec_context.c
index b4ac67d25a46fef9e9ca596d4b9fd13be5c214e9..286dc2432ca23032bbb9ef0d2bd950cf6789bf19 100644 (file)
--- a/src/lib/gssapi/mechglue/g_accept_sec_context.c
+++ b/src/lib/gssapi/mechglue/g_accept_sec_context.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_accept_sec_context.c 1.19     95/08/07 SMI"
+/* #ident  "@(#)gss_accept_sec_context.c 1.19     95/08/07 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.

diff --git a/src/lib/gssapi/mechglue/g_acquire_cred.c b/src/lib/gssapi/mechglue/g_acquire_cred.c
index f6bd7743c13310542316d112a718e31725e3bd3a..73b5c7d507a6c243df8f7eb7d26565049ad28d2e 100644 (file)
--- a/src/lib/gssapi/mechglue/g_acquire_cred.c
+++ b/src/lib/gssapi/mechglue/g_acquire_cred.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_acquire_cred.c 1.19     95/08/07 SMI"
+/* #ident  "@(#)gss_acquire_cred.c 1.19     95/08/07 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.

diff --git a/src/lib/gssapi/mechglue/g_compare_name.c b/src/lib/gssapi/mechglue/g_compare_name.c
index 5fb617832998e277cba455f63314fc578b450da7..97e08d0f00b159fcc2af5a041a602fc03766df64 100644 (file)
--- a/src/lib/gssapi/mechglue/g_compare_name.c
+++ b/src/lib/gssapi/mechglue/g_compare_name.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_compare_name.c 1.13     95/08/02 SMI"
+/* #ident  "@(#)gss_compare_name.c 1.13     95/08/02 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.

diff --git a/src/lib/gssapi/mechglue/g_context_time.c b/src/lib/gssapi/mechglue/g_context_time.c
index 826bcb76aa1ba905404fc43e608ca15c824acfa6..7351564f59c0e37496bff884725bf0cde3f0bab5 100644 (file)
--- a/src/lib/gssapi/mechglue/g_context_time.c
+++ b/src/lib/gssapi/mechglue/g_context_time.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_context_time.c 1.8     95/08/07 SMI"
+/* #ident  "@(#)gss_context_time.c 1.8     95/08/07 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.

diff --git a/src/lib/gssapi/mechglue/g_delete_sec_context.c b/src/lib/gssapi/mechglue/g_delete_sec_context.c
index 2bd9d595984ed36940f234f7b7d4d9787a70b1b3..5138569e2ae2327d166df69cf2238ae5128467a1 100644 (file)
--- a/src/lib/gssapi/mechglue/g_delete_sec_context.c
+++ b/src/lib/gssapi/mechglue/g_delete_sec_context.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_delete_sec_context.c 1.10     95/08/07 SMI"
+/* #ident  "@(#)gss_delete_sec_context.c 1.10     95/08/07 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.

diff --git a/src/lib/gssapi/mechglue/g_dsp_name.c b/src/lib/gssapi/mechglue/g_dsp_name.c
index 8dc75056782f8ec0078f88a381981edae327f9a7..c7abaf9b13993e7d96461e12f8cccca9aaccaff0 100644 (file)
--- a/src/lib/gssapi/mechglue/g_dsp_name.c
+++ b/src/lib/gssapi/mechglue/g_dsp_name.c
@@ -1,4 +1,4 @@
-#ident  "@(#)g_dsp_name.c 1.2     96/02/06 SMI"
+/* #ident  "@(#)g_dsp_name.c 1.2     96/02/06 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.

diff --git a/src/lib/gssapi/mechglue/g_dsp_status.c b/src/lib/gssapi/mechglue/g_dsp_status.c
index 0b629fe413d6661e4e76991ab6593d876e4dbb38..3c6e5785b30b67414cff40f4061631203e3c4e51 100644 (file)
--- a/src/lib/gssapi/mechglue/g_dsp_status.c
+++ b/src/lib/gssapi/mechglue/g_dsp_status.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_display_status.c 1.8     95/08/07 SMI"
+/* #ident  "@(#)gss_display_status.c 1.8     95/08/07 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.

diff --git a/src/lib/gssapi/mechglue/g_exp_sec_context.c b/src/lib/gssapi/mechglue/g_exp_sec_context.c
index a3e381f577518325e1a674c5a96fc7ee28fb4c5d..1af42ac399c5147993ac0cf59cb74c70df3d1be8 100644 (file)
--- a/src/lib/gssapi/mechglue/g_exp_sec_context.c
+++ b/src/lib/gssapi/mechglue/g_exp_sec_context.c
@@ -1,5 +1,4 @@
-
-#ident  "@(#)g_exp_sec_context.c 1.2     96/01/18 SMI"
+/* #ident  "@(#)g_exp_sec_context.c 1.2     96/01/18 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.

diff --git a/src/lib/gssapi/mechglue/g_glue.c b/src/lib/gssapi/mechglue/g_glue.c
index 5045492786490f75200a830d63589a576c56f25c..4e8a0300c61c47caac2a7945a749dba369fc1244 100644 (file)
--- a/src/lib/gssapi/mechglue/g_glue.c
+++ b/src/lib/gssapi/mechglue/g_glue.c
@@ -1,5 +1,4 @@
-
-#ident "@(#)g_glue.c 1.1     96/02/06 SMI"
+/* #ident      "@(#)g_glue.c 1.1     96/02/06 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.

diff --git a/src/lib/gssapi/mechglue/g_imp_name.c b/src/lib/gssapi/mechglue/g_imp_name.c
index 0f8d4e72fe3ed1e10a653ab10788da17f84c3a69..3e90d36e4e657e511157480b76b2b044ec6eeb9c 100644 (file)
--- a/src/lib/gssapi/mechglue/g_imp_name.c
+++ b/src/lib/gssapi/mechglue/g_imp_name.c
@@ -1,4 +1,4 @@
-#ident  "@(#)g_imp_name.c 1.2     96/02/06 SMI"
+/* #ident  "@(#)g_imp_name.c 1.2     96/02/06 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.

diff --git a/src/lib/gssapi/mechglue/g_imp_sec_context.c b/src/lib/gssapi/mechglue/g_imp_sec_context.c
index fea66e1925cfe3b515225516c49326d1d7bdb1c8..9d977c61ca10b0184ccbe00da844420d8c8330ba 100644 (file)
--- a/src/lib/gssapi/mechglue/g_imp_sec_context.c
+++ b/src/lib/gssapi/mechglue/g_imp_sec_context.c
@@ -1,5 +1,4 @@
-
-#ident  "@(#)g_imp_sec_context.c 1.2     96/01/18 SMI"
+/* #ident  "@(#)g_imp_sec_context.c 1.2     96/01/18 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.

diff --git a/src/lib/gssapi/mechglue/g_indicate_mechs.c b/src/lib/gssapi/mechglue/g_indicate_mechs.c
index 202be6071ba2fe0642d0f77e7b5143db221f6058..4bf7eed733b24172d51356bbed64d19fa1371584 100644 (file)
--- a/src/lib/gssapi/mechglue/g_indicate_mechs.c
+++ b/src/lib/gssapi/mechglue/g_indicate_mechs.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_indicate_mechs.c 1.13     95/08/04 SMI"
+/* #ident  "@(#)gss_indicate_mechs.c 1.13     95/08/04 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.

diff --git a/src/lib/gssapi/mechglue/g_init_sec_context.c b/src/lib/gssapi/mechglue/g_init_sec_context.c
index f0d4f7508c09b14109aee53629754d8540a10ae8..96d678332e55be94a677caed6522778eb81354d8 100644 (file)
--- a/src/lib/gssapi/mechglue/g_init_sec_context.c
+++ b/src/lib/gssapi/mechglue/g_init_sec_context.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_init_sec_context.c 1.20     95/08/07 SMI"
+/* #ident  "@(#)gss_init_sec_context.c 1.20     95/08/07 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.

diff --git a/src/lib/gssapi/mechglue/g_initialize.c b/src/lib/gssapi/mechglue/g_initialize.c
index fc936f5c745a091acdebda323b6bc399a5548de0..cc30e26e78d9bb74cc2c8de6334f314c022bd110 100644 (file)
--- a/src/lib/gssapi/mechglue/g_initialize.c
+++ b/src/lib/gssapi/mechglue/g_initialize.c
@@ -1,4 +1,4 @@
-#ident  "@(#)g_initialize.c 1.2     96/02/06 SMI"
+/* #ident  "@(#)g_initialize.c 1.2     96/02/06 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.

diff --git a/src/lib/gssapi/mechglue/g_inq_context.c b/src/lib/gssapi/mechglue/g_inq_context.c
index 44fa77e35e9a7ae3fa48983cde57e61a0bda3a50..105d203f8870b2cef8a85ddf0d650ac9ad03e90f 100644 (file)
--- a/src/lib/gssapi/mechglue/g_inq_context.c
+++ b/src/lib/gssapi/mechglue/g_inq_context.c
@@ -1,5 +1,4 @@
-
-#ident "@(#)g_inquire_context.c 1.2     96/01/18 SMI"
+/* #ident      "@(#)g_inquire_context.c 1.2     96/01/18 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.

diff --git a/src/lib/gssapi/mechglue/g_inq_cred.c b/src/lib/gssapi/mechglue/g_inq_cred.c
index edfdb3a280e3d821c92274fb6855ba899448f35a..12efbd29f3f2ab3435542d2e759e4ca1ea2d5231 100644 (file)
--- a/src/lib/gssapi/mechglue/g_inq_cred.c
+++ b/src/lib/gssapi/mechglue/g_inq_cred.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_inquire_cred.c 1.9     95/08/02 SMI"
+/* #ident  "@(#)gss_inquire_cred.c 1.9     95/08/02 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.

diff --git a/src/lib/gssapi/mechglue/g_inq_names.c b/src/lib/gssapi/mechglue/g_inq_names.c
index 89330e43f88e8ab1f9591f5f054ba6ed10b3894f..9715951910a3e0e5eebdf7b94e6ea3c20d4a753d 100644 (file)
--- a/src/lib/gssapi/mechglue/g_inq_names.c
+++ b/src/lib/gssapi/mechglue/g_inq_names.c
@@ -1,5 +1,4 @@
-
-#ident "@(#)g_inquire_names.c 1.1     95/12/19 SMI"
+/* #ident      "@(#)g_inquire_names.c 1.1     95/12/19 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.

diff --git a/src/lib/gssapi/mechglue/g_process_context.c b/src/lib/gssapi/mechglue/g_process_context.c
index 467dbbcd26e6633f1c01f4e90c19e5c77ce8b630..b09b2a6f5d48d2e14659766e3185fa743347340b 100644 (file)
--- a/src/lib/gssapi/mechglue/g_process_context.c
+++ b/src/lib/gssapi/mechglue/g_process_context.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_process_context.c 1.9     95/08/07 SMI"
+/* #ident  "@(#)gss_process_context.c 1.9     95/08/07 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.

diff --git a/src/lib/gssapi/mechglue/g_rel_buffer.c b/src/lib/gssapi/mechglue/g_rel_buffer.c
index a9188895e3066c02442b978d14a65ec814d70441..b39f3057e54f0ae01e86ed1b5fb2994540174e88 100644 (file)
--- a/src/lib/gssapi/mechglue/g_rel_buffer.c
+++ b/src/lib/gssapi/mechglue/g_rel_buffer.c
@@ -1,4 +1,4 @@
-#ident  "@(#)g_rel_buffer.c 1.2     96/02/06 SMI"
+/* #ident  "@(#)g_rel_buffer.c 1.2     96/02/06 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.

diff --git a/src/lib/gssapi/mechglue/g_rel_cred.c b/src/lib/gssapi/mechglue/g_rel_cred.c
index db34a4247d090fdec50ac09945dfcc66194d99a5..092492e7ffa969587c155340e3241c4932f5ef43 100644 (file)
--- a/src/lib/gssapi/mechglue/g_rel_cred.c
+++ b/src/lib/gssapi/mechglue/g_rel_cred.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_release_cred.c 1.15     95/08/07 SMI"
+/* #ident  "@(#)gss_release_cred.c 1.15     95/08/07 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.

diff --git a/src/lib/gssapi/mechglue/g_rel_name.c b/src/lib/gssapi/mechglue/g_rel_name.c
index c53212704a205fa8805d0e99384258585893521c..101b73009276cc198283379694aa6eb942210a52 100644 (file)
--- a/src/lib/gssapi/mechglue/g_rel_name.c
+++ b/src/lib/gssapi/mechglue/g_rel_name.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_release_name.c 1.2     95/05/09 SMI"
+/* #ident  "@(#)gss_release_name.c 1.2     95/05/09 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.

diff --git a/src/lib/gssapi/mechglue/g_rel_oid_set.c b/src/lib/gssapi/mechglue/g_rel_oid_set.c
index 2ffaf8c006b9c40b857559dbc797651efc4dc643..bbe44e598f07150db36fbf32e7825ab91fae464a 100644 (file)
--- a/src/lib/gssapi/mechglue/g_rel_oid_set.c
+++ b/src/lib/gssapi/mechglue/g_rel_oid_set.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_release_oid_set.c 1.12     95/08/23 SMI"
+/* #ident  "@(#)gss_release_oid_set.c 1.12     95/08/23 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.

diff --git a/src/lib/gssapi/mechglue/g_seal.c b/src/lib/gssapi/mechglue/g_seal.c
index 99805a422caecaf845df5a9d2b9c676399ed6dab..412202deeb3df2c3812689a5451110fb8e1ccac3 100644 (file)
--- a/src/lib/gssapi/mechglue/g_seal.c
+++ b/src/lib/gssapi/mechglue/g_seal.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_seal.c 1.10     95/08/07 SMI"
+/* #ident  "@(#)gss_seal.c 1.10     95/08/07 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.

diff --git a/src/lib/gssapi/mechglue/g_sign.c b/src/lib/gssapi/mechglue/g_sign.c
index 5345f00be91695e2b8886a2de470676fc8c1db50..78eee681d5cd0af0e56b3635ee6949e7dcc331bf 100644 (file)
--- a/src/lib/gssapi/mechglue/g_sign.c
+++ b/src/lib/gssapi/mechglue/g_sign.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_sign.c 1.10     95/08/07 SMI"
+/* #ident  "@(#)gss_sign.c 1.10     95/08/07 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.

diff --git a/src/lib/gssapi/mechglue/g_unseal.c b/src/lib/gssapi/mechglue/g_unseal.c
index db7b5d923429afe56a469a788a5f66ecbea02481..35cab05e2e310ce9c1049b66879178c0ea3e6bfc 100644 (file)
--- a/src/lib/gssapi/mechglue/g_unseal.c
+++ b/src/lib/gssapi/mechglue/g_unseal.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_unseal.c 1.10     95/08/07 SMI"
+/* #ident  "@(#)gss_unseal.c 1.10     95/08/07 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.

diff --git a/src/lib/gssapi/mechglue/g_verify.c b/src/lib/gssapi/mechglue/g_verify.c
index c2b02a5ebba5e6a84d9ec58c2b4b94b9ea583a35..53ed26268f76c56af8773dbf445c4d620708b018 100644 (file)
--- a/src/lib/gssapi/mechglue/g_verify.c
+++ b/src/lib/gssapi/mechglue/g_verify.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_verify.c 1.9     95/08/07 SMI"
+/* #ident  "@(#)gss_verify.c 1.9     95/08/07 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.

diff --git a/src/lib/gssapi/mechglue/gssd_pname_to_uid.c b/src/lib/gssapi/mechglue/gssd_pname_to_uid.c
index d3c18edaf0a55b98e7c795ee6098f7e4fd4ca0d7..eb7c051acdc9825124925cd67f5cb5d690fd06bd 100644 (file)
--- a/src/lib/gssapi/mechglue/gssd_pname_to_uid.c
+++ b/src/lib/gssapi/mechglue/gssd_pname_to_uid.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gssd_pname_to_uid.c 1.5     95/08/02 SMI"
+/* #ident  "@(#)gssd_pname_to_uid.c 1.5     95/08/02 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.

diff --git a/src/lib/gssapi/mechglue/mechglue.h b/src/lib/gssapi/mechglue/mechglue.h
index a8c9207a135957f249499118ece4a482f428f162..43347a49b75017707a9639378c093f6e9a742650 100644 (file)
--- a/src/lib/gssapi/mechglue/mechglue.h
+++ b/src/lib/gssapi/mechglue/mechglue.h
@@ -1,4 +1,4 @@
-#ident  "@(#)mechglue.h 1.13     95/08/07 SMI"
+/* #ident  "@(#)mechglue.h 1.13     95/08/07 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.
@@ -29,8 +29,11 @@
 #ifndef _GSS_MECHGLUE_H
 #define _GSS_MECHGLUE_H
 
+#if defined(__MWERKS__) || defined(applec) || defined(THINK_C)
+#include <gssapi.h>
+#else
 #include <gssapi/gssapi.h>
-#include <sys/types.h>
+#endif
 
 /********************************************************/
 /* GSSAPI Extension functions -- these functions aren't */

diff --git a/src/lib/gssapi/mechglue/mglueP.h b/src/lib/gssapi/mechglue/mglueP.h
index df5c34507fc4fa3f634b9badfedcd0970fe79826..df9802f0990cdee68723dee0dcc8aaf942469739 100644 (file)
--- a/src/lib/gssapi/mechglue/mglueP.h
+++ b/src/lib/gssapi/mechglue/mglueP.h
@@ -1,4 +1,5 @@
-#ident  "@(#)mglueP.h 1.2     96/01/18 SMI"
+/* #ident  "@(#)mglueP.h 1.2     96/01/18 SMI" */
+
 /*
  * This header contains the private mechglue definitions.
  *