arla-0.4 diffs for no kerberos

[Dan Winship]

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

-- Dan

diff -cr arla-0.4.orig/arlad/arla.c arla-0.4/arlad/arla.c
*** arla-0.4.orig/arlad/arla.c	Fri Mar 27 20:39:47 1998
--- arla-0.4/arlad/arla.c	Fri Mar 27 17:08:13 1998
***************
*** 491,497 ****
  "crypt",			/* 2 */
  NULL
  };
- #endif
  
  static int
  parse_rxkad_level (const char *s)
--- 491,496 ----
***************
*** 513,518 ****
--- 512,518 ----
      else
  	return -1;
  }
+ #endif
  
  static void
  usage (int ret)
***************
*** 556,564 ****
--- 556,566 ----
      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);
diff -cr arla-0.4.orig/arlad/messages.c arla-0.4/arlad/messages.c
*** arla-0.4.orig/arlad/messages.c	Fri Mar 27 20:39:53 1998
--- arla-0.4/arlad/messages.c	Fri Mar 27 18:05:31 1998
***************
*** 1580,1605 ****
  }
  
  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) {
--- 1580,1585 ----
***************
*** 1646,1651 ****
--- 1626,1650 ----
  #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;
***************
*** 1702,1710 ****
--- 1701,1711 ----
      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,
***************
*** 1719,1724 ****
--- 1720,1726 ----
  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)) {
***************
*** 1735,1740 ****
--- 1737,1745 ----
      } else
  	error = EINVAL;
      return error;
+ #else
+     return EOPNOTSUPP;
+ #endif
  }
  
  static int