summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/gssapi/mechglue/ChangeLog16
-rw-r--r--src/lib/gssapi/mechglue/g_accept_sec_context.c2
-rw-r--r--src/lib/gssapi/mechglue/g_acquire_cred.c2
-rw-r--r--src/lib/gssapi/mechglue/g_compare_name.c2
-rw-r--r--src/lib/gssapi/mechglue/g_context_time.c2
-rw-r--r--src/lib/gssapi/mechglue/g_delete_sec_context.c2
-rw-r--r--src/lib/gssapi/mechglue/g_dsp_name.c2
-rw-r--r--src/lib/gssapi/mechglue/g_dsp_status.c2
-rw-r--r--src/lib/gssapi/mechglue/g_exp_sec_context.c3
-rw-r--r--src/lib/gssapi/mechglue/g_glue.c3
-rw-r--r--src/lib/gssapi/mechglue/g_imp_name.c2
-rw-r--r--src/lib/gssapi/mechglue/g_imp_sec_context.c3
-rw-r--r--src/lib/gssapi/mechglue/g_indicate_mechs.c2
-rw-r--r--src/lib/gssapi/mechglue/g_init_sec_context.c2
-rw-r--r--src/lib/gssapi/mechglue/g_initialize.c2
-rw-r--r--src/lib/gssapi/mechglue/g_inq_context.c3
-rw-r--r--src/lib/gssapi/mechglue/g_inq_cred.c2
-rw-r--r--src/lib/gssapi/mechglue/g_inq_names.c3
-rw-r--r--src/lib/gssapi/mechglue/g_process_context.c2
-rw-r--r--src/lib/gssapi/mechglue/g_rel_buffer.c2
-rw-r--r--src/lib/gssapi/mechglue/g_rel_cred.c2
-rw-r--r--src/lib/gssapi/mechglue/g_rel_name.c2
-rw-r--r--src/lib/gssapi/mechglue/g_rel_oid_set.c2
-rw-r--r--src/lib/gssapi/mechglue/g_seal.c2
-rw-r--r--src/lib/gssapi/mechglue/g_sign.c2
-rw-r--r--src/lib/gssapi/mechglue/g_unseal.c2
-rw-r--r--src/lib/gssapi/mechglue/g_verify.c2
-rw-r--r--src/lib/gssapi/mechglue/gssd_pname_to_uid.c2
-rw-r--r--src/lib/gssapi/mechglue/mechglue.h7
-rw-r--r--src/lib/gssapi/mechglue/mglueP.h3
30 files changed, 50 insertions, 35 deletions
diff --git a/src/lib/gssapi/mechglue/ChangeLog b/src/lib/gssapi/mechglue/ChangeLog
index 9da259bc99..e07d39cdbf 100644
--- 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 b4ac67d25a..286dc2432c 100644
--- 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 f6bd7743c1..73b5c7d507 100644
--- 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 5fb6178329..97e08d0f00 100644
--- 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 826bcb76aa..7351564f59 100644
--- 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 2bd9d59598..5138569e2a 100644
--- 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 8dc7505678..c7abaf9b13 100644
--- 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 0b629fe413..3c6e5785b3 100644
--- 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 a3e381f577..1af42ac399 100644
--- 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 5045492786..4e8a0300c6 100644
--- 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 0f8d4e72fe..3e90d36e4e 100644
--- 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 fea66e1925..9d977c61ca 100644
--- 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 202be6071b..4bf7eed733 100644
--- 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 f0d4f7508c..96d678332e 100644
--- 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 fc936f5c74..cc30e26e78 100644
--- 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 44fa77e35e..105d203f88 100644
--- 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 edfdb3a280..12efbd29f3 100644
--- 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 89330e43f8..9715951910 100644
--- 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 467dbbcd26..b09b2a6f5d 100644
--- 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 a9188895e3..b39f3057e5 100644
--- 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 db34a4247d..092492e7ff 100644
--- 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 c53212704a..101b730092 100644
--- 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 2ffaf8c006..bbe44e598f 100644
--- 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 99805a422c..412202deeb 100644
--- 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 5345f00be9..78eee681d5 100644
--- 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 db7b5d9234..35cab05e2e 100644
--- 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 c2b02a5ebb..53ed26268f 100644
--- 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 d3c18edaf0..eb7c051acd 100644
--- 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 a8c9207a13..43347a49b7 100644
--- 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 df5c34507f..df9802f099 100644
--- 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.
*