[patch] arla HEAD on RedHat 7.2

[Simon Josefsson]

Using the i-didn't-understand-what-i-did-but-it-worked patch below and

CFLAGS=-I/usr/include/openssl ./configure --with-sys=/lib/modules/2.4.7-10/build/

arla HEAD in CVS seems to work on i386 RedHat 7.2 with kth-krb4 1.1
and heimdal 0.4e.

I think neither CFLAGS nor --with-sys above should really be
necessary, it seems as if RedHat finally did something about
/usr/src/linux, from /usr/include/linux/modversions.h:

#error Modules should never use kernel-headers system headers,
#error but rather headers from an appropriate kernel-source package.
#error Change -I/usr/src/linux/include (or similar) to
#error -I/lib/modules/$(uname -r)/build/include
#error to build against the currently-running kernel.

2001-10-27  Simon Josefsson  <jas at extundo.com>

	* appl/afsutils/Makefile.in (LIBS): 
	* appl/kalog/Makefile.in (LIBS): Add krb5 libs (for -lcrypt).

	* appl/lib/ka-procs.c (ka_authenticate): Pass afsid to k_afsklog_uid.

	* include/kafs.h (k_afsklog_uid, k_afsklog): Compat.

	* xfs/linux/xfs/xfs_locl.h: malloc.h is obsolete in at least
	2.2.16 and later, use slab.h instead.

	* cf/check-kerberos.m4 (AC_KRB5_LIB_WHERE1): Try -lcrypt -lresolv as well.

Index: appl/afsutils/Makefile.in
===================================================================
RCS file: /stacken-cvs/arla/appl/afsutils/Makefile.in,v
retrieving revision 1.20
diff -u -r1.20 Makefile.in
--- appl/afsutils/Makefile.in	2001/10/23 23:35:57	1.20
+++ appl/afsutils/Makefile.in	2001/10/27 00:13:58
@@ -59,10 +59,13 @@
 		  -L../../rx -lrx \
 		  -L../../lwp -llwp @PLWP_LIB_FLAGS@ \
 		  -L../../lib/ko -lko -L../../util -lutil \
+		  @KRB5_LIB_DIR@ \
 		  @LIB_roken@ \
 		  $(RXKAD_LIBS) \
 		  $(KAFS_LIBS) \
-		  $(RXKAD_LIBS) @LIBS@
+		  $(RXKAD_LIBS) \
+		  @KRB5_LIB_LIBS@ \
+		  @LIBS@
 
 LIBDEPENDS	= ../../rxdef/librxdefclient.a ../../rx/librx.a ../../lwp/liblwp.a \
 		  ../../util/libutil.a \
Index: appl/kalog/Makefile.in
===================================================================
RCS file: /stacken-cvs/arla/appl/kalog/Makefile.in,v
retrieving revision 1.11
diff -u -r1.11 Makefile.in
--- appl/kalog/Makefile.in	2001/10/15 01:35:05	1.11
+++ appl/kalog/Makefile.in	2001/10/27 00:13:58
@@ -59,10 +59,13 @@
 		  -L../../rx -lrx \
 		  -L../../lwp -llwp @PLWP_LIB_FLAGS@ \
 		  -L../../lib/ko -lko -L../../util -lutil \
+		  @KRB5_LIB_DIR@ \
 		  @LIB_roken@ \
 		  $(RXKAD_LIBS) \
 		  $(KAFS_LIBS) \
-		  $(RXKAD_LIBS) @LIBS@
+		  $(RXKAD_LIBS) \
+		  @KRB5_LIB_LIBS@ \
+                  @LIBS@
 
 LIBDEPENDS	= ../../rxdef/librxdefclient.a ../../rx/librx.a ../../lwp/liblwp.a \
 		  ../../util/libutil.a  \
Index: appl/lib/ka-procs.c
===================================================================
RCS file: /stacken-cvs/arla/appl/lib/ka-procs.c,v
retrieving revision 1.7
diff -u -r1.7 ka-procs.c
--- appl/lib/ka-procs.c	2001/10/03 22:42:54	1.7
+++ appl/lib/ka-procs.c	2001/10/27 00:13:59
@@ -259,6 +259,7 @@
     char filename[MAXPATHLEN];
     int ret;
     int save_ticket, do_afslog = 0;
+    int afsid;
 
     filename[0] = '\0';
     if (cell == NULL)
@@ -310,7 +311,8 @@
 #ifdef HAVE_KRB_AFSLOG_UID
 	    ret = krb_afslog (cell, cell);
 #else
-	    ret = k_afsklog_uid (cell, cell);
+	    ret = arlalib_get_viceid (user, cell, &afsid);
+	    ret = k_afsklog_uid (cell, cell, afsid);
 #endif
 	    if (ret) {
 		warnx ("failed inserting tokens for cell %s", cell);
Index: cf/check-kerberos.m4
===================================================================
RCS file: /stacken-cvs/arla/cf/check-kerberos.m4,v
retrieving revision 1.40
diff -u -r1.40 check-kerberos.m4
--- cf/check-kerberos.m4	2001/10/23 23:22:49	1.40
+++ cf/check-kerberos.m4	2001/10/27 00:14:00
@@ -451,6 +451,8 @@
          "-lasn1 -ldes $LIB_roken" 		dnl heimdal w/ roken w/o dep on db
          "-lasn1 -ldes $LIB_roken -lresolv" 	dnl heimdal w/ roken w/o dep on db w/ dep on resolv
          "-lasn1 -lcrypto -lcom_err $LIB_roken"	dnl heimdal-BSD w/ roken w/o dep on db
+         "-lasn1 -lcrypto -lcom_err $LIB_roken -lresolv"		dnl heimdal-RH72 w/ roken w/o dep on db w/ dep on resolv
+         "-lasn1 -lcrypto -lcom_err $LIB_roken -lcrypt -lresolv"	dnl heimdal-RH72 w/ roken w/o dep on db w/ dep on resolv w/ dep on crypt
 	 "-lasn1 -ldes $LIB_roken -ldb" 		dnl heimdal w/ roken w/ dep on db
 	 "-lasn1 -ldes $LIB_roken -ldb -lresolv" 	dnl heimdal w/ roken w/ dep on db w/ dep on resolv
 	 "-lasn1 -lcrypto -lcom_err $LIB_roken -ldb" dnl heimdal-BSD w/ roken w/ dep on db
Index: include/kafs.h
===================================================================
RCS file: /stacken-cvs/arla/include/kafs.h,v
retrieving revision 1.39
diff -u -r1.39 kafs.h
--- include/kafs.h	2001/10/09 03:23:21	1.39
+++ include/kafs.h	2001/10/27 00:14:00
@@ -452,6 +452,10 @@
 int krb_afslog __P((const char *cell, const char *realm));
 int krb_afslog_uid __P((const char *cell, const char *realm, uid_t uid));
 
+/* compat */
+#define k_afsklog krb_afslog
+#define k_afsklog_uid krb_afslog_uid
+
 int k_pioctl __P((char *a_path,
 		  int o_opcode,
 		  struct ViceIoctl *a_paramsP,
Index: xfs/linux/xfs/xfs_locl.h
===================================================================
RCS file: /stacken-cvs/arla/xfs/linux/xfs/xfs_locl.h,v
retrieving revision 1.52
diff -u -r1.52 xfs_locl.h
--- xfs/linux/xfs/xfs_locl.h	2001/09/16 13:11:36	1.52
+++ xfs/linux/xfs/xfs_locl.h	2001/10/27 00:14:03
@@ -47,7 +47,7 @@
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/time.h>
 #include <linux/sched.h>
 #include <linux/stat.h>