s3:utils: let smbstatus report anonymous signing/encryption explicitly

[samba.git] / source3 / modules / vfs_virusfilter_utils.c

diff --git a/source3/modules/vfs_virusfilter_utils.c b/source3/modules/vfs_virusfilter_utils.c
index f1a7a9ba6cbe7e1ca417d05ee241ea6cfb4ad8c6..b4677799c50b77e9e744a3a4ed3c2b9036c18831 100644 (file)
--- a/source3/modules/vfs_virusfilter_utils.c
+++ b/source3/modules/vfs_virusfilter_utils.c
@@ -25,6 +25,7 @@ struct iovec;
 #include "lib/util/iov_buf.h"
 #include <tevent.h>
 #include "lib/tsocket/tsocket.h"
+#include "source3/lib/substitute.h"
 
 int virusfilter_debug_class = DBGC_VFS;
 
@@ -35,8 +36,11 @@ char *virusfilter_string_sub(
        connection_struct *conn,
        const char *str)
 {
-       return talloc_sub_advanced(mem_ctx,
-               lp_servicename(mem_ctx, SNUM(conn)),
+       const struct loadparm_substitution *lp_sub =
+               loadparm_s3_global_substitution();
+
+       return talloc_sub_full(mem_ctx,
+               lp_servicename(mem_ctx, lp_sub, SNUM(conn)),
                conn->session_info->unix_info->unix_name,
                conn->connectpath,
                conn->session_info->unix_token->gid,
@@ -52,7 +56,11 @@ int virusfilter_vfs_next_move(
 {
        int result;
 
-       result = SMB_VFS_NEXT_RENAME(vfs_h, smb_fname_src, smb_fname_dst);
+       result = SMB_VFS_NEXT_RENAMEAT(vfs_h,
+                       vfs_h->conn->cwd_fsp,
+                       smb_fname_src,
+                       vfs_h->conn->cwd_fsp,
+                       smb_fname_dst);
        if (result == 0 || errno != EXDEV) {
                return result;
        }
@@ -390,7 +398,7 @@ bool virusfilter_io_writel(
        return virusfilter_io_write(io_h, io_h->w_eol, io_h->w_eol_size);
 }
 
-bool virusfilter_io_writefl(
+bool PRINTF_ATTRIBUTE(2, 3) virusfilter_io_writefl(
        struct virusfilter_io_handle *io_h,
        const char *data_fmt, ...)
 {
@@ -413,7 +421,7 @@ bool virusfilter_io_writefl(
        return virusfilter_io_write(io_h, data, data_size);
 }
 
-bool virusfilter_io_vwritefl(
+bool PRINTF_ATTRIBUTE(2, 0) virusfilter_io_vwritefl(
        struct virusfilter_io_handle *io_h,
        const char *data_fmt, va_list ap)
 {
@@ -641,7 +649,7 @@ bool virusfilter_io_readl(TALLOC_CTX *ctx,
                }
 
                /*
-                * We read read_size bytes. Extend the useable
+                * We read read_size bytes. Extend the usable
                 * buffer length.
                 */
                io_h->r_len += read_size;
@@ -663,7 +671,7 @@ bool virusfilter_io_readl(TALLOC_CTX *ctx,
        return ok;
 }
 
-bool virusfilter_io_writefl_readl(
+bool PRINTF_ATTRIBUTE(3, 4) virusfilter_io_writefl_readl(
        struct virusfilter_io_handle *io_h,
        char **read_line,
        const char *fmt, ...)
@@ -948,10 +956,6 @@ int virusfilter_shell_set_conn_env(
        fstring pidstr;
        int ret;
 
-       if (local_machine_name == NULL || *local_machine_name == '\0') {
-               local_machine_name = lp_netbios_name();
-       }
-
        server_addr_p = tsocket_address_inet_addr_string(
                                conn->sconn->local_address, talloc_tos());
 
@@ -1001,7 +1005,7 @@ int virusfilter_shell_set_conn_env(
        virusfilter_env_set(mem_ctx, env_list, "VIRUSFILTER_USER_NAME",
                            get_current_username());
        virusfilter_env_set(mem_ctx, env_list, "VIRUSFILTER_USER_DOMAIN",
-                           current_user_info.domain);
+                           get_current_user_info_domain());
 
        return 0;
 }