#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;
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,
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, ...)
{
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)
{
}
/*
- * We read read_size bytes. Extend the useable
+ * We read read_size bytes. Extend the usable
* buffer length.
*/
io_h->r_len += read_size;
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, ...)
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());
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;
}