r23792: convert Samba4 to GPLv3

[tprouty/samba.git] / source4 / ntvfs / ntvfs.h

diff --git a/source4/ntvfs/ntvfs.h b/source4/ntvfs/ntvfs.h
index 6916ea10fc0f5c1c16e64bd7a1c33c74bb2cca55..12a4b3a4dfd05be66f9411f2608bca0fa44b04a7 100644 (file)
--- a/source4/ntvfs/ntvfs.h
+++ b/source4/ntvfs/ntvfs.h
@@ -6,7 +6,7 @@
    
    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
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -15,11 +15,14 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef _NTVFS_H_
+#define _NTVFS_H_
+
 #include "libcli/raw/interfaces.h"
+#include "param/share.h"
 
 /* modules can use the following to determine if the interface has changed */
 /* version 1 -> 0 - make module stacking easier -- metze */
@@ -88,11 +91,11 @@ struct ntvfs_ops {
        NTSTATUS (*search_first)(struct ntvfs_module_context *ntvfs,
                                 struct ntvfs_request *req,
                                 union smb_search_first *io, void *private,
-                                BOOL (*callback)(void *private, union smb_search_data *file));
+                                BOOL (*callback)(void *private, const union smb_search_data *file));
        NTSTATUS (*search_next)(struct ntvfs_module_context *ntvfs,
                                struct ntvfs_request *req,
                                union smb_search_next *io, void *private,
-                               BOOL (*callback)(void *private, union smb_search_data *file));
+                               BOOL (*callback)(void *private, const union smb_search_data *file));
        NTSTATUS (*search_close)(struct ntvfs_module_context *ntvfs,
                                 struct ntvfs_request *req,
                                 union smb_search_close *io);
@@ -181,11 +184,9 @@ struct ntvfs_context {
         */
        struct ntvfs_module_context *modules;
 
-       struct {
-               int snum;
-       } config;
+       struct share_config *config;
 
-       uint32_t server_id;
+       struct server_id server_id;
        struct event_context *event_ctx;
        struct messaging_context *msg_ctx;
 
@@ -312,3 +313,5 @@ struct messaging_context;
 #include "librpc/gen_ndr/security.h"
 #include "librpc/gen_ndr/notify.h"
 #include "ntvfs/ntvfs_proto.h"
+
+#endif /* _NTVFS_H_ */