=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rdistd/filesys-os.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- src/usr.bin/rdistd/filesys-os.c 2015/01/16 06:40:11 1.12 +++ src/usr.bin/rdistd/filesys-os.c 2015/01/20 09:00:16 1.13 @@ -1,4 +1,4 @@ -/* $OpenBSD: filesys-os.c,v 1.12 2015/01/16 06:40:11 deraadt Exp $ */ +/* $OpenBSD: filesys-os.c,v 1.13 2015/01/20 09:00:16 guenther Exp $ */ /* * Copyright (c) 1983 Regents of the University of California. @@ -31,8 +31,10 @@ #include #include +#include +#include -#include "defs.h" +#include "server.h" /* * OS specific file system routines @@ -84,11 +86,9 @@ if (strcmp(mnt->f_fstypename, "nfs") == 0) { strlcpy(remote_dev, mnt->f_mntfromname, sizeof(remote_dev)); mntstruct.me_path = remote_dev; - mntstruct.me_type = METYPE_NFS; - } else { + mntstruct.me_flags |= MEFLAG_NFS; + } else mntstruct.me_path = mnt->f_mntonname; - mntstruct.me_type = METYPE_OTHER; - } mnt++; entries_left--; @@ -116,7 +116,6 @@ new = xmalloc(sizeof *new); new->me_path = xstrdup(old->me_path); - new->me_type = xstrdup(old->me_type); new->me_flags = old->me_flags; return (new);