* Makefile.in (t_walk_rtree, t_kerb): Do not link against kdb libraries

	for these test executables.

	* srv_rcache.c (krb5_get_server_rcache): Cast argument to
	isgraph() to int.

	* init_ctx.c: Cast arguments to isspace() to int. If unix is defined,
	include ../krb5_libinit.h. There has to be a better was for windows.

	* conv_princ.c (krb5_425_conv_principal): Cast argument to isupper().
	to int.

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

5 files changed, 27 insertions, 11 deletions

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 2802e8c..3899ed7 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,17 @@
+2001-06-12  Ezra Peisach  <epeisach@mit.edu>
+
+	* Makefile.in (t_walk_rtree, t_kerb): Do not link against kdb libraries
+	for these test executables. 
+
+	* srv_rcache.c (krb5_get_server_rcache): Cast argument to
+	isgraph() to int.
+
+	* init_ctx.c: Cast arguments to isspace() to int. If unix is defined, 
+	include ../krb5_libinit.h. There has to be a better was for windows.
+
+	* conv_princ.c (krb5_425_conv_principal): Cast argument to isupper().
+	to int.
+
 2001-06-11  Ezra Peisach  <epeisach@mit.edu>
 
 	* str_conv.c: If strptime() is present on system without a
diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in
index 19c1da4..6418178 100644
--- a/src/lib/krb5/krb/Makefile.in
+++ b/src/lib/krb5/krb/Makefile.in
@@ -291,13 +291,11 @@ T_SER_OBJS= t_ser.o ser_actx.o ser_adata.o ser_addr.o ser_auth.o ser_cksum.o \
 
 T_DELTAT_OBJS= t_deltat.o deltat.o
 
-t_walk_rtree: $(T_WALK_RTREE_OBJS) $(KDB5_DEPLIBS) $(KRB5_BASE_DEPLIBS)
-	$(CC_LINK) -o t_walk_rtree $(T_WALK_RTREE_OBJS) \
-		$(KDB5_LIBS) $(KRB5_BASE_LIBS)
+t_walk_rtree: $(T_WALK_RTREE_OBJS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o t_walk_rtree $(T_WALK_RTREE_OBJS) $(KRB5_BASE_LIBS)
 
-t_kerb: $(T_KERB_OBJS) $(KDB5_DEPLIBS) $(KRB5_BASE_DEPLIBS)
-	$(CC_LINK) -o t_kerb $(T_KERB_OBJS) \
-		$(KDB5_LIBS) $(KRB5_BASE_LIBS)
+t_kerb: $(T_KERB_OBJS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o t_kerb $(T_KERB_OBJS) $(KRB5_BASE_LIBS)
 
 t_ser: $(T_SER_OBJS) $(KDB5_DEPLIBS) $(KRB5_BASE_DEPLIBS)
 	$(CC_LINK) -o t_ser $(T_SER_OBJS) \
diff --git a/src/lib/krb5/krb/conv_princ.c b/src/lib/krb5/krb/conv_princ.c
index 8805fe0..fb1e346 100644
--- a/src/lib/krb5/krb/conv_princ.c
+++ b/src/lib/krb5/krb/conv_princ.c
@@ -318,7 +318,7 @@ krb5_425_conv_principal(context, name, instance, realm, princ)
 		      return retval;
 		  if (domain) {
 		      for (cp = domain; *cp; cp++)
-			  if (isupper(*cp))
+			  if (isupper((int) (*cp)))
 			      *cp = tolower(*cp);
 		      strncat(buf, ".", sizeof(buf) - 1 - strlen(buf));
 		      strncat(buf, domain, sizeof(buf) - 1 - strlen(buf));
diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c
index 6a68720..e420951 100644
--- a/src/lib/krb5/krb/init_ctx.c
+++ b/src/lib/krb5/krb/init_ctx.c
@@ -55,6 +55,10 @@
 #include "k5-int.h"
 #include <ctype.h>
 #include "brand.c"
+/* There has to be a better way for windows... */
+#if defined(unix) 
+#include "../krb5_libinit.h"
+#endif
 
 /* The des-mdX entries are last for now, because it's easy to
    configure KDCs to issue TGTs with des-mdX keys and then not accept
@@ -329,11 +333,11 @@ get_profile_etype_list(context, ktypes, profstr, ctx_count, ctx_list)
 	count = 0;
 	sp = retval;
 	while (sp) {
-	    for (ep = sp; *ep && (*ep != ',') && !isspace(*ep); ep++)
+	    for (ep = sp; *ep && (*ep != ',') && !isspace((int) (*ep)); ep++)
 		;
 	    if (*ep) {
 		*ep++ = '\0';
-		while (isspace(*ep) || *ep == ',')
+		while (isspace((int) (*ep)) || *ep == ',')
 		    *ep++ = '\0';
 	    } else
 		ep = (char *) NULL;
diff --git a/src/lib/krb5/krb/srv_rcache.c b/src/lib/krb5/krb/srv_rcache.c
index 33e7684..ad5f7bf 100644
--- a/src/lib/krb5/krb/srv_rcache.c
+++ b/src/lib/krb5/krb/srv_rcache.c
@@ -61,7 +61,7 @@ krb5_get_server_rcache(context, piece, rcptr)
     for (i = 0; i < piece->length; i++) {
 	if (piece->data[i] == '\\')
 	    len++;
-	else if (!isgraph(piece->data[i]))
+	else if (!isgraph((int) piece->data[i]))
 	    len += 3;
     }
 
@@ -84,7 +84,7 @@ krb5_get_server_rcache(context, piece, rcptr)
 	    cachename[p++] = '\\';
 	    continue;
 	}
-	if (!isgraph(piece->data[i])) {
+	if (!isgraph((int) piece->data[i])) {
 	    sprintf(tmp, "%03o", piece->data[i]);
 	    cachename[p++] = '\\';
 	    cachename[p++] = tmp[0];