4 files changed, 22 insertions, 22 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 7544cc1d8c..6bdf64972d 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -787,7 +787,7 @@ OPLOCK_OBJ = smbd/oplock.o smbd/oplock_irix.o smbd/oplock_linux.o \
 NOTIFY_OBJ = smbd/notify.o smbd/notify_inotify.o smbd/notify_internal.o \
 	     librpc/gen_ndr/ndr_notify.o librpc/gen_ndr/ndr_file_id.o
 
-FNAME_UTIL_OBJ = smbd/filename_util.o
+FNAME_UTIL_OBJ = lib/filename_util.o
 
 VFS_DEFAULT_OBJ = modules/vfs_default.o
 VFS_AUDIT_OBJ = modules/vfs_audit.o
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 94f8ad60b4..35cfa2073a 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -3727,26 +3727,6 @@ NTSTATUS filename_convert(TALLOC_CTX *mem_ctx,
 			bool *ppath_contains_wcard,
 			struct smb_filename **pp_smb_fname);
 
-/* The following definitions come from smbd/filename_utils.c */
-
-NTSTATUS get_full_smb_filename(TALLOC_CTX *ctx, const struct smb_filename *smb_fname,
-			      char **full_name);
-NTSTATUS create_synthetic_smb_fname(TALLOC_CTX *ctx, const char *base_name,
-				    const char *stream_name,
-				    const SMB_STRUCT_STAT *psbuf,
-				    struct smb_filename **smb_fname_out);
-NTSTATUS create_synthetic_smb_fname_split(TALLOC_CTX *ctx,
-					  const char *fname,
-					  const SMB_STRUCT_STAT *psbuf,
-					  struct smb_filename **smb_fname_out);
-const char *smb_fname_str_dbg(const struct smb_filename *smb_fname);
-const char *fsp_str_dbg(const struct files_struct *fsp);
-NTSTATUS copy_smb_filename(TALLOC_CTX *ctx,
-			   const struct smb_filename *smb_fname_in,
-			   struct smb_filename **smb_fname_out);
-bool is_ntfs_stream_smb_fname(const struct smb_filename *smb_fname);
-bool is_ntfs_default_stream_smb_fname(const struct smb_filename *smb_fname);
-
 /* The following definitions come from smbd/files.c  */
 
 NTSTATUS file_new(struct smb_request *req, connection_struct *conn,
@@ -4716,4 +4696,24 @@ bool sid_check_is_in_unix_groups(const struct dom_sid *sid);
 const char *unix_groups_domain_name(void);
 bool lookup_unix_group_name(const char *name, struct dom_sid *sid);
 
+/* The following definitions come from lib/filename_util.c */
+
+NTSTATUS get_full_smb_filename(TALLOC_CTX *ctx, const struct smb_filename *smb_fname,
+			      char **full_name);
+NTSTATUS create_synthetic_smb_fname(TALLOC_CTX *ctx, const char *base_name,
+				    const char *stream_name,
+				    const SMB_STRUCT_STAT *psbuf,
+				    struct smb_filename **smb_fname_out);
+NTSTATUS create_synthetic_smb_fname_split(TALLOC_CTX *ctx,
+					  const char *fname,
+					  const SMB_STRUCT_STAT *psbuf,
+					  struct smb_filename **smb_fname_out);
+const char *smb_fname_str_dbg(const struct smb_filename *smb_fname);
+const char *fsp_str_dbg(const struct files_struct *fsp);
+NTSTATUS copy_smb_filename(TALLOC_CTX *ctx,
+			   const struct smb_filename *smb_fname_in,
+			   struct smb_filename **smb_fname_out);
+bool is_ntfs_stream_smb_fname(const struct smb_filename *smb_fname);
+bool is_ntfs_default_stream_smb_fname(const struct smb_filename *smb_fname);
+
 #endif /*  _PROTO_H_  */
diff --git a/source3/smbd/filename_util.c b/source3/lib/filename_util.c
index aad8a08e2b..aad8a08e2b 100644
--- a/source3/smbd/filename_util.c
+++ b/source3/lib/filename_util.c
diff --git a/source3/wscript_build b/source3/wscript_build
index 9a3c88a9e6..7a19af92e2 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -245,7 +245,7 @@ OPLOCK_SRC = '''smbd/oplock.c smbd/oplock_irix.c smbd/oplock_linux.c
 
 NOTIFY_SRC = '''smbd/notify.c smbd/notify_inotify.c smbd/notify_internal.c'''
 
-FNAME_UTIL_SRC = '''smbd/filename_util.c'''
+FNAME_UTIL_SRC = '''lib/filename_util.c'''
 
 
 PLAINTEXT_AUTH_SRC = '''auth/pampass.c auth/pass_check.c'''