From 46418dddda9128c8fad8c68f6aa2212b7ad566c9 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 2 Aug 2022 14:06:44 -0700 Subject: [PATCH] s3: smbd: Convert driver_unix_convert() to use filename_convert_dirfsp(). There is now only one user left of unix_convert(), inside the MSDFS code. I have plans to get rid of this soon. Signed-off-by: Jeremy Allison Reviewed-by: Volker Lendecke Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Thu Aug 4 18:10:43 UTC 2022 on sn-devel-184 --- source3/printing/nt_printing.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index ec15c070ca6..4b4d12f25d5 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -259,9 +259,15 @@ static NTSTATUS driver_unix_convert(connection_struct *conn, } trim_string(name,"/","/"); - status = unix_convert(ctx, conn, name, 0, psmb_fname, 0); + status = filename_convert_dirfsp(ctx, + conn, + name, + 0, /* ucf_flags */ + 0, /* twrp */ + pdirfsp, + psmb_fname); if (!NT_STATUS_IS_OK(status)) { - return NT_STATUS_NO_MEMORY; + return status; } return NT_STATUS_OK; -- 2.47.3