Remove etc/afpd/afp_vfs.h. Obsolete and moved to include/atalk/vfs.h

diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am
index 319f62830629099739e144de37479168c837a998..99135ff679990f24a5f70d1ea1bf26eb3e60e369 100644 (file)
--- a/etc/afpd/Makefile.am
+++ b/etc/afpd/Makefile.am
@@ -20,8 +20,7 @@ afpd_LDFLAGS = -export-dynamic
 
 noinst_HEADERS = auth.h afp_config.h desktop.h directory.h file.h \
         filedir.h fork.h globals.h icon.h mangle.h misc.h status.h switch.h \
-        uam_auth.h uid.h unix.h volume.h hash.h acls.h acl_mappings.h \
-        afp_vfs.h extattrs.h
+        uam_auth.h uid.h unix.h volume.h hash.h acls.h acl_mappings.h extattrs.h
 
 LIBS = @LIBS@ @QUOTA_LIBS@ @SLP_LIBS@ @WRAP_LIBS@ @LIBADD_DL@
 

diff --git a/etc/afpd/afp_vfs.h b/etc/afpd/afp_vfs.h
deleted file mode 100644 (file)
index 5c5f751..0000000
--- a/etc/afpd/afp_vfs.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-   Copyright (c) 2004 Didier Gautheron
- 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
- 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-   vfs layer for afp
-*/
-
-#ifndef _AFP_VFS_H
-#define _AFP_VFS_H
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif /* HAVE_CONFIG_H */
-
-#ifdef HAVE_NFSv4_ACLS
-#include <sys/acl.h>
-#endif
-
-#include <atalk/adouble.h>
-struct vol;
-
-struct vfs_ops {
-    /* low level adouble fn */
-    char *(*ad_path)(const char *, int);
-
-    /* */
-    int (*validupath)(const struct vol *, const char *);
-    int (*rf_chown)(const struct vol *, const char *path, uid_t owner, gid_t group);
-    int (*rf_renamedir)(const struct vol *, const char *oldpath, const char *newpath);
-    int (*rf_deletecurdir)(const struct vol *);
-    int (*rf_setfilmode)(const struct vol *, const char * name, mode_t mode, struct stat *st);
-    int (*rf_setdirmode)(const struct vol *, const char * name, mode_t mode, struct stat *st);
-    int (*rf_setdirunixmode)(const struct vol *, const char * name, mode_t mode, struct stat *st);
-
-    int (*rf_setdirowner)(const struct vol *, const char *path, uid_t owner, gid_t group);
-
-    int (*rf_deletefile)(const struct vol *, const char * );
-    int (*rf_renamefile)(const struct vol *, const char *oldpath, const char *newpath);
-#ifdef HAVE_NFSv4_ACLS
-    int (*rf_acl)(const struct vol *, const char *path, int cmd, int count, ace_t *aces);
-    int (*rf_remove_acl)(const struct vol *, const char *path, int dir);
-#endif
-};
-
-void initvol_vfs(struct vol *vol);
-
-#endif

diff --git a/etc/afpd/volume.c b/etc/afpd/volume.c
index fb57115f0681280c459f85e1ae75de2a048f01db..13f4afa50f78ae47eed8abb3ed991764f5d42b22 100644 (file)
--- a/etc/afpd/volume.c
+++ b/etc/afpd/volume.c
@@ -1,5 +1,5 @@
 /*
- * $Id: volume.c,v 1.96 2009-10-27 23:35:17 didg Exp $
+ * $Id: volume.c,v 1.97 2009-10-29 10:55:46 franklahm Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -44,6 +44,7 @@ char *strchr (), *strrchr ();
 #include <atalk/util.h>
 #include <atalk/volinfo.h>
 #include <atalk/logger.h>
+#include <atalk/vfs.h>
 #ifdef CNID_DB
 #include <atalk/cnid.h>
 #endif /* CNID_DB*/
@@ -56,7 +57,6 @@ char *strchr (), *strrchr ();
 #include "mangle.h"
 #include "fork.h"
 #include "hash.h"
-#include "afp_vfs.h"
 
 extern int afprun(int root, char *cmd, int *outfd);