svn commit: lorikeet r576 - in trunk/heimdal/lib/gssapi: mech spnego

[lha at samba.org]

Author: lha
Date: 2006-10-07 18:29:34 +0000 (Sat, 07 Oct 2006)
New Revision: 576

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=576

Log:
merge build fixes from heimdal cvs 20061008
Modified:
   trunk/heimdal/lib/gssapi/mech/gss_mech_switch.c
   trunk/heimdal/lib/gssapi/mech/mech_locl.h
   trunk/heimdal/lib/gssapi/spnego/accept_sec_context.c
   trunk/heimdal/lib/gssapi/spnego/context_stubs.c
   trunk/heimdal/lib/gssapi/spnego/spnego_locl.h


Changeset:
Modified: trunk/heimdal/lib/gssapi/mech/gss_mech_switch.c
===================================================================
--- trunk/heimdal/lib/gssapi/mech/gss_mech_switch.c	2006-10-07 17:41:33 UTC (rev 575)
+++ trunk/heimdal/lib/gssapi/mech/gss_mech_switch.c	2006-10-07 18:29:34 UTC (rev 576)
@@ -28,7 +28,7 @@
 
 #include "mech_locl.h"
 #include <heim_threads.h>
-RCSID("$Id: gss_mech_switch.c,v 1.5 2006/07/20 02:01:56 lha Exp $");
+RCSID("$Id: gss_mech_switch.c,v 1.6 2006/10/06 07:25:49 lha Exp $");
 
 #ifndef _PATH_GSS_MECH
 #define _PATH_GSS_MECH	"/etc/gss/mech"
@@ -227,11 +227,11 @@
 			continue;
 		p = buf;
 		name = strsep(&p, "\t\n ");
-		if (p) while (isspace(*p)) p++;
+		if (p) while (isspace((unsigned char)*p)) p++;
 		oid = strsep(&p, "\t\n ");
-		if (p) while (isspace(*p)) p++;
+		if (p) while (isspace((unsigned char)*p)) p++;
 		lib = strsep(&p, "\t\n ");
-		if (p) while (isspace(*p)) p++;
+		if (p) while (isspace((unsigned char)*p)) p++;
 		kobj = strsep(&p, "\t\n ");
 		if (!name || !oid || !lib || !kobj)
 			continue;

Modified: trunk/heimdal/lib/gssapi/mech/mech_locl.h
===================================================================
--- trunk/heimdal/lib/gssapi/mech/mech_locl.h	2006-10-07 17:41:33 UTC (rev 575)
+++ trunk/heimdal/lib/gssapi/mech/mech_locl.h	2006-10-07 18:29:34 UTC (rev 576)
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-/* $Id: mech_locl.h,v 1.3 2006/07/07 22:21:56 lha Exp $ */
+/* $Id: mech_locl.h,v 1.4 2006/10/07 18:25:27 lha Exp $ */
 
 #include <config.h>
 
@@ -49,6 +49,8 @@
 #include <gssapi_asn1.h>
 #include <der.h>
 
+#include <roken.h>
+
 #include <gssapi.h>
 #include <gssapi_mech.h>
 

Modified: trunk/heimdal/lib/gssapi/spnego/accept_sec_context.c
===================================================================
--- trunk/heimdal/lib/gssapi/spnego/accept_sec_context.c	2006-10-07 17:41:33 UTC (rev 575)
+++ trunk/heimdal/lib/gssapi/spnego/accept_sec_context.c	2006-10-07 18:29:34 UTC (rev 576)
@@ -33,7 +33,7 @@
 
 #include "spnego_locl.h"
 
-RCSID("$Id: accept_sec_context.c,v 1.4 2006/10/02 08:07:57 lha Exp $");
+RCSID("$Id: accept_sec_context.c,v 1.5 2006/10/06 07:26:13 lha Exp $");
 
 OM_uint32
 _gss_spnego_encode_response(OM_uint32 *minor_status,
@@ -243,7 +243,7 @@
 
     /* Send the constructed SAM name for this host */
     for (p = hostname; *p != '\0' && *p != '.'; p++) {
-	*p = toupper(*p);
+	*p = toupper((unsigned char)*p);
     }
     *p++ = '$';
     *p = '\0';

Modified: trunk/heimdal/lib/gssapi/spnego/context_stubs.c
===================================================================
--- trunk/heimdal/lib/gssapi/spnego/context_stubs.c	2006-10-07 17:41:33 UTC (rev 575)
+++ trunk/heimdal/lib/gssapi/spnego/context_stubs.c	2006-10-07 18:29:34 UTC (rev 576)
@@ -32,7 +32,7 @@
 
 #include "spnego_locl.h"
 
-RCSID("$Id: context_stubs.c,v 1.7 2006/10/02 08:07:57 lha Exp $");
+RCSID("$Id$");
 
 static OM_uint32
 spnego_supported_mechs(OM_uint32 *minor_status, gss_OID_set *mechs)

Modified: trunk/heimdal/lib/gssapi/spnego/spnego_locl.h
===================================================================
--- trunk/heimdal/lib/gssapi/spnego/spnego_locl.h	2006-10-07 17:41:33 UTC (rev 575)
+++ trunk/heimdal/lib/gssapi/spnego/spnego_locl.h	2006-10-07 18:29:34 UTC (rev 576)
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: spnego_locl.h,v 1.8 2006/10/02 08:07:58 lha Exp $ */
+/* $Id: spnego_locl.h,v 1.9 2006/10/07 18:27:00 lha Exp $ */
 
 #ifndef SPNEGO_LOCL_H
 #define SPNEGO_LOCL_H
@@ -39,7 +39,12 @@
 #include <config.h>
 #endif
 
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
+#endif
 
 #ifdef HAVE_PTHREAD_H
 #include <pthread.h>