arla-0.4 diffs for no kerberos

[Love]

Dan Winship <danw at MIT.EDU> writes:

> I don't know if you care about these, but you broke non-kerberized
> support. Patches enclosed.

Thanks, fixed. Added you patch for bits.c

Love

Index: arla.c
===================================================================
RCS file: /usr/local/cvsroot/arla/arlad/arla.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -w -r1.65 -r1.66
--- arla.c	1998/03/27 03:13:46	1.65
+++ arla.c	1998/03/28 09:08:45	1.66
@@ -46,7 +46,7 @@
 
 #include <version.h>
 
-RCSID("$Id: arla.c,v 1.65 1998/03/27 03:13:46 assar Exp $") ;
+RCSID("$Id: arla.c,v 1.66 1998/03/28 09:08:45 lha Exp $") ;
 
 #define AFSNAMEMAX 256
 
@@ -497,7 +497,6 @@
 "crypt",			/* 2 */
 NULL
 };
-#endif
 
 static int
 parse_rxkad_level (const char *s)
@@ -519,6 +518,7 @@
     else
 	return -1;
 }
+#endif
 
 static void
 usage (int ret)
@@ -562,9 +562,11 @@
     if (argc != 0)
 	usage (1);
 
+#ifdef KERBEROS
     rxkad_min_level = parse_rxkad_level (rxkad_level_string);
     if (rxkad_min_level < 0)
 	errx (1, "bad rxkad level `%s'", rxkad_level_string);
+#endif
 
     signal (SIGINT, sigint);
     signal (SIGTERM, sigint);
Index: arlad/messages.c
===================================================================
RCS file: /usr/local/cvsroot/arla/arlad/messages.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -w -r1.54 -r1.55
--- messages.c	1998/03/26 02:55:36	1.54
+++ messages.c	1998/03/28 09:08:46	1.55
@@ -37,7 +37,7 @@
  */
 
 #include "arla_local.h"
-RCSID("$Id: messages.c,v 1.54 1998/03/26 02:55:36 rb Exp $");
+RCSID("$Id: messages.c,v 1.55 1998/03/28 09:08:46 lha Exp $");
 
 #include <xfs_message.h>
 
@@ -1532,26 +1532,6 @@
 }
 
 static int
-viocflush (int fd, struct xfs_message_pioctl *h, u_int size)
-{
-    VenusFid fid ;
-    AFSCallBack broken_callback = {0, 0, CBDROPPED};
-
-    fid.Cell = h->handle.a;
-    fid.fid.Volume = h->handle.b;
-    fid.fid.Vnode = h->handle.c;
-    fid.fid.Unique = h->handle.d;
-
-    arla_log(ADEBMISC,
-	    "flushing (%d, %u, %u, %u)",
-	     fid.Cell, fid.fid.Volume, fid.fid.Vnode, fid.fid.Unique);
-
-    fcache_stale_entry(fid, broken_callback);
-    return 0 ;
-}
-
-
-static int
 viocgettok (int fd, struct xfs_message_pioctl *h, u_int size)
 {
     if (h->insize == 0) {
@@ -1598,6 +1578,25 @@
 #endif /* KERBEROS */
 
 static int
+viocflush (int fd, struct xfs_message_pioctl *h, u_int size)
+{
+    VenusFid fid ;
+    AFSCallBack broken_callback = {0, 0, CBDROPPED};
+
+    fid.Cell = h->handle.a;
+    fid.fid.Volume = h->handle.b;
+    fid.fid.Vnode = h->handle.c;
+    fid.fid.Unique = h->handle.d;
+
+    arla_log(ADEBMISC,
+	    "flushing (%d, %u, %u, %u)",
+	     fid.Cell, fid.fid.Volume, fid.fid.Vnode, fid.fid.Unique);
+
+    fcache_stale_entry(fid, broken_callback);
+    return 0 ;
+}
+
+static int
 viocconnect(int fd, struct xfs_message_pioctl *h, u_int size)
 {
     char *p = h->msg;
@@ -1654,9 +1653,11 @@
     if (h->outsize == sizeof(u_int32_t)) {
 	u_int32_t n;
 
+#ifdef KERBEROS
 	if (rxkad_min_level == rxkad_crypt)
 	    n = 1;
 	else
+#endif
 	    n = 0;
 
 	xfs_send_message_wakeup_data (fd,
@@ -1671,6 +1672,7 @@
 static int
 setrxkcrypt(int fd, struct xfs_message_pioctl *h, u_int size)
 {
+#ifdef KERBEROS
     int error = 0;
 
     if (h->insize == sizeof(u_int32_t)) {
@@ -1687,6 +1689,9 @@
     } else
 	error = EINVAL;
     return error;
+#else
+    return EOPNOTSUPP;
+#endif
 }
 
 static int
 
Index: bits.c
===================================================================
RCS file: /usr/local/cvsroot/arla/include/bits.c,v
retrieving revision 1.3
diff -u -w -r1.3 bits.c
--- bits.c	1998/03/12 22:27:29	1.3
+++ bits.c	1998/03/28 09:23:29
@@ -45,6 +45,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 
+#ifndef HAVE_STRUPR
 static void
 strupr(char *s)
 {
@@ -55,7 +56,7 @@
 	p++;
     }	
 }
-
+#endif
 
 #define BITSIZE(TYPE)						\
 {								\