===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rdistd/filesys.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -c -r1.17 -r1.18
*** src/usr.bin/rdistd/filesys.c	2015/01/16 06:40:11	1.17
--- src/usr.bin/rdistd/filesys.c	2015/01/20 09:00:16	1.18
***************
*** 1,4 ****
! /*	$OpenBSD: filesys.c,v 1.17 2015/01/16 06:40:11 deraadt Exp $	*/
  
  /*
   * Copyright (c) 1983 Regents of the University of California.
--- 1,4 ----
! /*	$OpenBSD: filesys.c,v 1.18 2015/01/20 09:00:16 guenther Exp $	*/
  
  /*
   * Copyright (c) 1983 Regents of the University of California.
***************
*** 31,38 ****
  
  #include <sys/types.h>
  #include <sys/mount.h>
  
! #include "defs.h"
  
  /*
   * This file contains functions dealing with getting info
--- 31,41 ----
  
  #include <sys/types.h>
  #include <sys/mount.h>
+ #include <errno.h>
+ #include <string.h>
+ #include <unistd.h>
  
! #include "server.h"
  
  /*
   * This file contains functions dealing with getting info
***************
*** 230,237 ****
  
  	mntinfo = mi;
  	while ((mnt = getmountent()) != NULL) {
! 		debugmsg(DM_MISC, "mountent = '%s' (%s)", 
! 			 mnt->me_path, mnt->me_type);
  
  		/*
  		 * Make sure we don't already have it for some reason
--- 233,239 ----
  
  	mntinfo = mi;
  	while ((mnt = getmountent()) != NULL) {
! 		debugmsg(DM_MISC, "mountent = '%s'", mnt->me_path);
  
  		/*
  		 * Make sure we don't already have it for some reason
***************
*** 339,352 ****
  {
  	mntent_t *mnt;
  
! 	if ((mnt = (mntent_t *) getmntpt(path, statbuf, isvalid)) == NULL)
  		return(-1);
  
! 	/*
! 	 * We treat "cachefs" just like NFS
! 	 */
! 	if ((strcmp(mnt->me_type, METYPE_NFS) == 0) ||
! 	    (strcmp(mnt->me_type, "cachefs") == 0))
  		return(1);
  
  	return(0);
--- 341,350 ----
  {
  	mntent_t *mnt;
  
! 	if ((mnt = getmntpt(path, statbuf, isvalid)) == NULL)
  		return(-1);
  
! 	if (mnt->me_flags & MEFLAG_NFS)
  		return(1);
  
  	return(0);