r8093: Next round. Now it compiles with --enable-socket-wrapper.

Volker
(This used to be commit 25cbcfba30f534f3fb31627ba43421c42ccd5b0f)

diff --git a/source3/include/idmap.h b/source3/include/idmap.h
index 7205058ee8758bb7834f68b6baaef4b06a7dc8ef..c81b94a718a0cc382b03e77565e0cdb381add8b4 100644 (file)
--- a/source3/include/idmap.h
+++ b/source3/include/idmap.h
@@ -50,7 +50,7 @@ struct idmap_methods {
        NTSTATUS (*set_mapping)(const DOM_SID *sid, unid_t id, int id_type);
 
        /* Called when backend is unloaded */
-       NTSTATUS (*close)(void);
+       NTSTATUS (*close_fn)(void);
 
        /* Called to dump backend status */
        void (*status)(void);

diff --git a/source3/include/libsmbclient.h b/source3/include/libsmbclient.h
index ea013c113a0ca86c2ebefbdb31268ba6e18e6906..3269d6f0bf7d7628bbce0a0800a9dd0cf3d7d87a 100644 (file)
--- a/source3/include/libsmbclient.h
+++ b/source3/include/libsmbclient.h
@@ -379,7 +379,7 @@ struct _SMBCCTX {
        off_t      (*lseek)   (SMBCCTX *c, SMBCFILE * file, off_t offset, int whence);
        int        (*stat)    (SMBCCTX *c, const char *fname, struct stat *st);
        int        (*fstat)   (SMBCCTX *c, SMBCFILE *file, struct stat *st);
-       int        (*close)   (SMBCCTX *c, SMBCFILE *file);
+       int        (*close_fn) (SMBCCTX *c, SMBCFILE *file);
 
        /** callable functions for dirs
         */ 

diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index c1bab368c956af2375c007eaf73aa30c9efb2c41..71b4f6562799545a65378628655b226e0d9fc660 100644 (file)
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -213,7 +213,7 @@ struct vfs_ops {
        struct vfs_fn_pointers {
                /* Disk operations */
                
-               int (*connect)(struct vfs_handle_struct *handle, struct connection_struct *conn, const char *service, const char *user);
+               int (*connect_fn)(struct vfs_handle_struct *handle, struct connection_struct *conn, const char *service, const char *user);
                void (*disconnect)(struct vfs_handle_struct *handle, struct connection_struct *conn);
                SMB_BIG_UINT (*disk_free)(struct vfs_handle_struct *handle, struct connection_struct *conn, const char *path, BOOL small_query, SMB_BIG_UINT *bsize, 
                        SMB_BIG_UINT *dfree, SMB_BIG_UINT *dsize);
@@ -235,7 +235,7 @@ struct vfs_ops {
                /* File operations */
                
                int (*open)(struct vfs_handle_struct *handle, struct connection_struct *conn, const char *fname, int flags, mode_t mode);
-               int (*close)(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd);
+               int (*close_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd);
                ssize_t (*read)(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd, void *data, size_t n);
                ssize_t (*pread)(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd, void *data, size_t n, SMB_OFF_T offset);
                ssize_t (*write)(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd, const void *data, size_t n);
@@ -326,7 +326,7 @@ struct vfs_ops {
        struct vfs_handles_pointers {
                /* Disk operations */
 
-               struct vfs_handle_struct *connect;
+               struct vfs_handle_struct *connect_hnd;
                struct vfs_handle_struct *disconnect;
                struct vfs_handle_struct *disk_free;
                struct vfs_handle_struct *get_quota;
@@ -347,7 +347,7 @@ struct vfs_ops {
                /* File operations */
 
                struct vfs_handle_struct *open;
-               struct vfs_handle_struct *close;
+               struct vfs_handle_struct *close_hnd;
                struct vfs_handle_struct *read;
                struct vfs_handle_struct *pread;
                struct vfs_handle_struct *write;

diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h
index 40ecd75fc9c9b061e38e8752d86037b4c20d3711..0647796ea845577bd7493a5a920dff6de20530e6 100644 (file)
--- a/source3/include/vfs_macros.h
+++ b/source3/include/vfs_macros.h
@@ -28,7 +28,7 @@
 ********************************************************************/
 
 /* Disk operations */    
-#define SMB_VFS_CONNECT(conn, service, user) ((conn)->vfs.ops.connect((conn)->vfs.handles.connect, (conn), (service), (user)))
+#define SMB_VFS_CONNECT(conn, service, user) ((conn)->vfs.ops.connect_fn((conn)->vfs.handles.connect_hnd, (conn), (service), (user)))
 #define SMB_VFS_DISCONNECT(conn) ((conn)->vfs.ops.disconnect((conn)->vfs.handles.disconnect, (conn)))
 #define SMB_VFS_DISK_FREE(conn, path, small_query, bsize, dfree ,dsize) ((conn)->vfs.ops.disk_free((conn)->vfs.handles.disk_free, (conn), (path), (small_query), (bsize), (dfree), (dsize)))
 #define SMB_VFS_GET_QUOTA(conn, qtype, id, qt) ((conn)->vfs.ops.get_quota((conn)->vfs.handles.get_quota, (conn), (qtype), (id), (qt)))
@@ -47,7 +47,7 @@
     
 /* File operations */
 #define SMB_VFS_OPEN(conn, fname, flags, mode) ((conn)->vfs.ops.open((conn)->vfs.handles.open, (conn), (fname), (flags), (mode)))
-#define SMB_VFS_CLOSE(fsp, fd) ((fsp)->conn->vfs.ops.close((fsp)->conn->vfs.handles.close, (fsp), (fd)))
+#define SMB_VFS_CLOSE(fsp, fd) ((fsp)->conn->vfs.ops.close_fn((fsp)->conn->vfs.handles.close_hnd, (fsp), (fd)))
 #define SMB_VFS_READ(fsp, fd, data, n) ((fsp)->conn->vfs.ops.read((fsp)->conn->vfs.handles.read, (fsp), (fd), (data), (n)))
 #define SMB_VFS_PREAD(fsp, fd, data, n, off) ((fsp)->conn->vfs.ops.pread((fsp)->conn->vfs.handles.pread, (fsp), (fd), (data), (n), (off)))
 #define SMB_VFS_WRITE(fsp, fd, data, n) ((fsp)->conn->vfs.ops.write((fsp)->conn->vfs.handles.write, (fsp), (fd), (data), (n)))
@@ -138,7 +138,7 @@
 ********************************************************************/
 
 /* Disk operations */    
-#define SMB_VFS_OPAQUE_CONNECT(conn, service, user) ((conn)->vfs_opaque.ops.connect((conn)->vfs_opaque.handles.connect, (conn), (service), (user)))
+#define SMB_VFS_OPAQUE_CONNECT(conn, service, user) ((conn)->vfs_opaque.ops.connect_fn((conn)->vfs_opaque.handles.connect_hnd, (conn), (service), (user)))
 #define SMB_VFS_OPAQUE_DISCONNECT(conn) ((conn)->vfs_opaque.ops.disconnect((conn)->vfs_opaque.handles.disconnect, (conn)))
 #define SMB_VFS_OPAQUE_DISK_FREE(conn, path, small_query, bsize, dfree ,dsize) ((conn)->vfs_opaque.ops.disk_free((conn)->vfs_opaque.handles.disk_free, (conn), (path), (small_query), (bsize), (dfree), (dsize)))
 #define SMB_VFS_OPAQUE_GET_QUOTA(conn, qtype, id, qt) ((conn)->vfs_opaque.ops.get_quota((conn)->vfs_opaque.handles.get_quota, (conn), (qtype), (id), (qt)))
@@ -157,7 +157,7 @@
     
 /* File operations */
 #define SMB_VFS_OPAQUE_OPEN(conn, fname, flags, mode) ((conn)->vfs_opaque.ops.open((conn)->vfs_opaque.handles.open, (conn), (fname), (flags), (mode)))
-#define SMB_VFS_OPAQUE_CLOSE(fsp, fd) ((fsp)->conn->vfs_opaque.ops.close((fsp)->conn->vfs_opaque.handles.close, (fsp), (fd)))
+#define SMB_VFS_OPAQUE_CLOSE(fsp, fd) ((fsp)->conn->vfs_opaque.ops.close_fn((fsp)->conn->vfs_opaque.handles.close_hnd, (fsp), (fd)))
 #define SMB_VFS_OPAQUE_READ(fsp, fd, data, n) ((fsp)->conn->vfs_opaque.ops.read((fsp)->conn->vfs_opaque.handles.read, (fsp), (fd), (data), (n)))
 #define SMB_VFS_OPAQUE_PREAD(fsp, fd, data, n, off) ((fsp)->conn->vfs_opaque.ops.pread((fsp)->conn->vfs_opaque.handles.pread, (fsp), (fd), (data), (n), (off)))
 #define SMB_VFS_OPAQUE_WRITE(fsp, fd, data, n) ((fsp)->conn->vfs_opaque.ops.write((fsp)->conn->vfs_opaque.handles.write, (fsp), (fd), (data), (n)))
@@ -248,7 +248,7 @@
 ********************************************************************/
 
 /* Disk operations */    
-#define SMB_VFS_NEXT_CONNECT(handle, conn, service, user) ((handle)->vfs_next.ops.connect((handle)->vfs_next.handles.connect, (conn), (service), (user)))
+#define SMB_VFS_NEXT_CONNECT(handle, conn, service, user) ((handle)->vfs_next.ops.connect_fn((handle)->vfs_next.handles.connect_hnd, (conn), (service), (user)))
 #define SMB_VFS_NEXT_DISCONNECT(handle, conn) ((handle)->vfs_next.ops.disconnect((handle)->vfs_next.handles.disconnect, (conn)))
 #define SMB_VFS_NEXT_DISK_FREE(handle, conn, path, small_query, bsize, dfree ,dsize) ((handle)->vfs_next.ops.disk_free((handle)->vfs_next.handles.disk_free, (conn), (path), (small_query), (bsize), (dfree), (dsize)))
 #define SMB_VFS_NEXT_GET_QUOTA(handle, conn, qtype, id, qt) ((handle)->vfs_next.ops.get_quota((handle)->vfs_next.handles.get_quota, (conn), (qtype), (id), (qt)))
@@ -268,7 +268,7 @@
     
 /* File operations */
 #define SMB_VFS_NEXT_OPEN(handle, conn, fname, flags, mode) ((handle)->vfs_next.ops.open((handle)->vfs_next.handles.open, (conn), (fname), (flags), (mode)))
-#define SMB_VFS_NEXT_CLOSE(handle, fsp, fd) ((handle)->vfs_next.ops.close((handle)->vfs_next.handles.close, (fsp), (fd)))
+#define SMB_VFS_NEXT_CLOSE(handle, fsp, fd) ((handle)->vfs_next.ops.close_fn((handle)->vfs_next.handles.close_hnd, (fsp), (fd)))
 #define SMB_VFS_NEXT_READ(handle, fsp, fd, data, n) ((handle)->vfs_next.ops.read((handle)->vfs_next.handles.read, (fsp), (fd), (data), (n)))
 #define SMB_VFS_NEXT_PREAD(handle, fsp, fd, data, n, off) ((handle)->vfs_next.ops.pread((handle)->vfs_next.handles.pread, (fsp), (fd), (data), (n), (off)))
 #define SMB_VFS_NEXT_WRITE(handle, fsp, fd, data, n) ((handle)->vfs_next.ops.write((handle)->vfs_next.handles.write, (fsp), (fd), (data), (n)))

diff --git a/source3/libsmb/libsmb_compat.c b/source3/libsmb/libsmb_compat.c
index 3dc60f7240b3a3f37bfd77d5cbc2c9c51f6f4a4c..f9461f936834cce8d49f4b493e80f70f60ba9e7e 100644 (file)
--- a/source3/libsmb/libsmb_compat.c
+++ b/source3/libsmb/libsmb_compat.c
@@ -163,7 +163,7 @@ int smbc_open(const char *furl, int flags, mode_t mode)
 
        fd = add_fd(file);
        if (fd == -1) 
-               statcont->close(statcont, file);
+               statcont->close_fn(statcont, file);
        return fd;
 }
 
@@ -180,7 +180,7 @@ int smbc_creat(const char *furl, mode_t mode)
        fd = add_fd(file);
        if (fd == -1) {
                /* Hmm... should we delete the file too ? I guess we could try */
-               statcont->close(statcont, file);
+               statcont->close_fn(statcont, file);
                statcont->unlink(statcont, furl);
        }
        return fd;
@@ -209,7 +209,7 @@ int smbc_close(int fd)
 {
        SMBCFILE * file = find_fd(fd);
        del_fd(fd);
-       return statcont->close(statcont, file);
+       return statcont->close_fn(statcont, file);
 }
 
 int smbc_unlink(const char *fname)

diff --git a/source3/libsmb/libsmbclient.c b/source3/libsmb/libsmbclient.c
index 1823bb2ace82d022e4f89afb21766576b719eb8b..9104a083f53ee81412037d838342d58bf5cb4640 100644 (file)
--- a/source3/libsmb/libsmbclient.c
+++ b/source3/libsmb/libsmbclient.c
@@ -4953,7 +4953,7 @@ static int smbc_print_file_ctx(SMBCCTX *c_file, const char *fname, SMBCCTX *c_pr
         if ((int)(fid2 = c_print->open_print_job(c_print, printq)) < 0) {
 
                 saverr = errno;  /* Save errno */
-                c_file->close(c_file, fid1);
+                c_file->close_fn(c_file, fid1);
                 errno = saverr;
                 return -1;
 
@@ -4966,8 +4966,8 @@ static int smbc_print_file_ctx(SMBCCTX *c_file, const char *fname, SMBCCTX *c_pr
                 if ((c_print->write(c_print, fid2, buf, bytes)) < 0) {
 
                         saverr = errno;
-                        c_file->close(c_file, fid1);
-                        c_print->close(c_print, fid2);
+                        c_file->close_fn(c_file, fid1);
+                        c_print->close_fn(c_print, fid2);
                         errno = saverr;
 
                 }
@@ -4976,8 +4976,8 @@ static int smbc_print_file_ctx(SMBCCTX *c_file, const char *fname, SMBCCTX *c_pr
 
         saverr = errno;
 
-        c_file->close(c_file, fid1);  /* We have to close these anyway */
-        c_print->close(c_print, fid2);
+        c_file->close_fn(c_file, fid1);  /* We have to close these anyway */
+        c_print->close_fn(c_print, fid2);
 
         if (bytes < 0) {
 
@@ -5152,7 +5152,7 @@ SMBCCTX * smbc_new_context(void)
         context->creat                             = smbc_creat_ctx;
         context->read                              = smbc_read_ctx;
         context->write                             = smbc_write_ctx;
-        context->close                             = smbc_close_ctx;
+        context->close_fn                          = smbc_close_ctx;
         context->unlink                            = smbc_unlink_ctx;
         context->rename                            = smbc_rename_ctx;
         context->lseek                             = smbc_lseek_ctx;
@@ -5206,7 +5206,7 @@ int smbc_free_context(SMBCCTX * context, int shutdown_ctx)
                 
                 f = context->internal->_files;
                 while (f) {
-                        context->close(context, f);
+                        context->close_fn(context, f);
                         f = f->next;
                 }
                 context->internal->_files = NULL;

diff --git a/source3/sam/idmap.c b/source3/sam/idmap.c
index 91fe97e23a44610c689138d64ee608c3519f8160..ec3ccb29859e480ac45df56bb5d65d0e7500e469 100644 (file)
--- a/source3/sam/idmap.c
+++ b/source3/sam/idmap.c
@@ -353,14 +353,14 @@ NTSTATUS idmap_close(void)
        if (proxyonly)
                return NT_STATUS_OK;
 
-       ret = cache_map->close();
+       ret = cache_map->close_fn();
        if (!NT_STATUS_IS_OK(ret)) {
                DEBUG(3, ("idmap_close: failed to close local tdb cache!\n"));
        }
        cache_map = NULL;
 
        if (remote_map) {
-               ret = remote_map->close();
+               ret = remote_map->close_fn();
                if (!NT_STATUS_IS_OK(ret)) {
                        DEBUG(3, ("idmap_close: failed to close remote idmap repository!\n"));
                }