Merge from branch-2-1

[netatalk.git] / include / atalk / ea.h

diff --git a/include/atalk/ea.h b/include/atalk/ea.h
index 4d47a0d3f69d07d4987e5990f5793cc1caa78c65..c0165a1a257f210999055d8a271bc81dadf9e2a8 100644 (file)
--- a/include/atalk/ea.h
+++ b/include/atalk/ea.h
@@ -1,5 +1,5 @@
 /*
-   $Id: ea.h,v 1.9 2009-11-18 11:14:59 didg Exp $
+   $Id: ea.h,v 1.11 2010-03-12 15:16:49 franklahm Exp $
    Copyright (c) 2009 Frank Lahm <franklahm@gmail.com>
 
    This program is free software; you can redistribute it and/or modify
@@ -20,7 +20,7 @@
 #include <config.h>
 #endif
 
-#ifdef HAVE_NFSv4_ACLS
+#ifdef HAVE_SOLARIS_ACLS
 #include <sys/acl.h>
 #endif
 
@@ -99,6 +99,7 @@ struct ea_entry {
 struct ea {
     uint32_t             ea_inited;       /* needed for interfacing ea_open w. ea_close */
     const struct vol     *vol;            /* vol handle, ea_close needs it */
+    int                  dirfd;           /* for *at (cf openat) semantics, -1 means ignore */
     char                 *filename;       /* name of file, needed by ea_close too */
     unsigned int         ea_count;        /* number of EAs in ea_entries array */
     struct ea_entry      (*ea_entries)[]; /* malloced and realloced as needed by ea_count*/
@@ -149,4 +150,17 @@ extern int sys_remove_ea(VFS_FUNC_ARGS_EA_REMOVE);
 /* native EA VFSfile/dir cp/mv/rm */
 extern int sys_ea_copyfile(VFS_FUNC_ARGS_COPYFILE);
 
+/* dbd needs access to these */
+extern int ea_open(const struct vol * restrict vol,
+                   const char * restrict uname,
+                   eaflags_t eaflags,
+                   struct ea * restrict ea);
+extern int ea_openat(const struct vol * restrict vol,
+                     int dirfd,
+                     const char * restrict uname,
+                     eaflags_t eaflags,
+                     struct ea * restrict ea);
+extern int ea_close(struct ea * restrict ea);
+extern char *ea_path(const struct ea * restrict ea, const char * restrict eaname, int macname);
+
 #endif /* ATALK_EA_H */