make it compile w/o krb4

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5859 ec53bebd-3082-4978-b11e-865c3cabbd6b

kuser/kdestroy.c

@@ -115,11 +115,11 @@ main (int argc, char **argv)
 #if KRB4
     if(dest_tkt_flag && dest_tkt ())
 	exit_val = 1;
-#endif
     if (unlog_flag && k_hasafs ()) {
 	if (k_unlog ())
 	    exit_val = 1;
     }
+#endif
 
     return exit_val;
 }

kuser/klist.c

@@ -267,6 +267,7 @@ check_for_tgt (krb5_context context,
     return expired;
 }
 
+#ifdef KRB4
 /*
  * Print a list of all AFS tokens
  */
@@ -322,6 +323,7 @@ display_tokens(int do_verbose)
 	putchar('\n');
     }
 }
+#endif
 
 static int version_flag = 0;
 static int help_flag	= 0;
@@ -413,8 +415,10 @@ main (int argc, char **argv)
     krb5_free_principal (context, principal);
     krb5_free_context (context);
 
+#ifdef KRB4
     if (!do_test && do_tokens && k_hasafs ())
 	display_tokens (do_verbose);
+#endif
 
     return exit_status;
 }

lib/auth/sia/Makefile.am

@@ -13,7 +13,7 @@ DEFS = @DEFS@
 ## link with non-installed libraries
 
 L =					\
-	$(top_builddir)/lib/kafs/.libs/libkafs.a	\
+	$(LIB_kafs)					\
 	$(top_builddir)/lib/krb5/.libs/libkrb5.a	\
 	$(top_builddir)/lib/asn1/.libs/libasn1.a	\
 	$(LIB_krb4)					\

lib/auth/sia/sia.c

@@ -390,6 +390,7 @@ siad_ses_reauthent (sia_collect_func_t *collect,
            duplicate some code here... */
 	struct state *s = (struct state*)entity->mech[pkgind];
 	chown(s->ticket, entity->pwd->pw_uid, entity->pwd->pw_gid);
+#ifdef KRB4
 	if(k_hasafs()) {
 	    char cell[64];
 	    if(k_afs_cell_of_file(entity->pwd->pw_dir, 
@@ -397,6 +398,7 @@ siad_ses_reauthent (sia_collect_func_t *collect,
 		krb_afslog(cell, 0);
 	    krb_afslog_home(0, 0, entity->pwd->pw_dir);
 	}
+#endif
     }
     return ret;
 }

lib/roken/Makefile.am

@@ -9,11 +9,13 @@ libroken_la_LDFLAGS = -version-info 0:0:0
 
 noinst_PROGRAMS = make-roken make-print-version
 
+if KRB4
 if KRB5
 ## need to link with des here; otherwise, if krb4 is shared the link
 ## will fail with unresolved references
 make_print_version_LDADD += $(LIB_krb4) -ldes
 endif
+endif
 
 libroken_la_SOURCES =		\
 	base64.c		\