[SCM] Samba Shared Repository - branch master updated
Jeremy Allison
jra at samba.org
Wed Apr 17 18:53:03 MDT 2013
The branch, master has been updated
via 406450d smbd: Remove NTSTATUS based create_synthetic_smb_fname
via cc0b835 smbd: Convert create_file_unixpath to synthetic_smb_fname
via 940ad94 smbd: Convert is_visible_file to synthetic_smb_fname
via 59cfbc7 smbd: Convert dptr_create to synthetic_smb_fname
via 235a309 smbd: Convert print_spool_open to synthetic_smb_fname
via ea519ec smbd: Convert driver_unlink_internals to synthetic_smb_fname
via 2b97eb1 vfstest: Convert cmd_set_nt_acl to synthetic_smb_fname
via 6f7d9b2 vfstest: Convert cmd_utime to synthetic_smb_fname
via 6624095 vfstest: Convert cmd_lstat to synthetic_smb_fname
via 7d54030 vfstest: Convert cmd_stat to synthetic_smb_fname
via a6985e6 vfstest: Convert cmd_rename to synthetic_smb_fname
via 434885a vfstest: Convert cmd_pathfunc to synthetic_smb_fname
via 1f6b0af vfstest: Convert cmd_open to synthetic_smb_fname
via 0cb0564 vfs: Convert dirsort_opendir to synthetic_smb_fname
via 730c57b vfs: Convert vfs_scannedonly to synthetic_smb_fname
via d70de07 smbd: Convert set_create_timespec_ea to synthetic_smb_fname
via fb211c3 smbd: Convert unix_mode to synthetic_smb_fname
via af40d23 smbd: Convert rmdir_internals to synthetic_smb_fname
via f5873c9 smbd: Convert recursive_rmdir to synthetic_smb_fname
via 39470c8 smbd: Convert delete_all_streams to synthetic_smb_fname
via 421eeef smbd: Convert open_streams_for_delete to synthetic_smb_fname
via 66beff7 smbd: Convert msg_file_was_renamed to synthetic_smb_fname
via 39c5a77 smbd: Convert change_dir_owner_to_parent to synthetic_smb_fname
via d003f2f smbd: Convert change_dir_owner_to_parent to synthetic_smb_fname
via c9a220b smbd: Convert change_file_owner_to_parent to synthetic_smb_fname
via 81e9c01 smbd: Convert make_connection_snum to synthetic_smb_fname
via 10d8d7d smbd: Convert rename_internals_fsp to synthetic_smb_fname
via 862c561 smbd: Convert remove_msdfs_link to synthetic_smb_fname
via 576df87 smbd: Convert create_msdfs_link to synthetic_smb_fname
via 01b8f34 smbd: Convert can_delete_file_in_directory to synthetic_smb_fname
via e3a7f70 smbd: Convert file_new to synthetic_smb_fname
via 2d76ce3 smbd: Convert open_dir_with_privilege to synthetic_smb_fname
via fe79862 smbd: Convert open_np_file to synthetic_smb_fname
via fa3f2fd smbd: Convert smb_file_rename_information to synthetic_smb_fname
via 419dd4f smbd: Convert smb_file_rename_information to synthetic_smb_fname
via 9cf8d69 smbd: Convert smb2_file_rename_information to synthetic_smb_fname
via 381bd97 smbd: Convert smb_set_file_dosmode to synthetic_smb_fname
via edb7293 smbd: Convert call_trans2qfilepathinfo to synthetic_smb_fname
via aa52340 smbd: Convert posix_sys_acl_blob_get_file to synthetic_smb_fname
via 1dc2920 pysmbd: Convert py_smbd_unlink to synthetic_smb_fname
via 204d971 pysmbd: Convert set_nt_acl_conn to synthetic_smb_fname
via 1675bf3 smbd: Convert filename_convert_internal to synthetic_smb_fname
via 0b14720 smbd: Convert vfs_lstat_smb_fname to synthetic_smb_fname
via 9041f3d smbd: Convert vfs_stat_smb_fname to synthetic_smb_fname
via bde53d8 smbd: Convert check_reduced_name_with_privilege to synthetic_smb_fname
via e086675 smbd: Convert vfs_GetWd to synthetic_smb_fname
via 75911f9 smbd: Convert vfs_default_durable_reconnect to synthetic_smb_fname
via 97d006f vfs: Convert non_posix_sys_acl_blob_get_file_helper to synthetic_smb_fname
via 3d05622 vfs: Convert vfswrap_fs_capabilities to synthetic_smb_fname
via a613074 vfs: Convert streams_depot_streaminfo to synthetic_smb_fname
via 952d348 vfs: Convert collect_one_stream to synthetic_smb_fname
via 83e6ff1 vfs: Convert streams_depot_rmdir to synthetic_smb_fname
via 87d9209 vfs: Convert streams_depot_unlink to synthetic_smb_fname
via 1729d78 vfs: Convert streams_depot_open to synthetic_smb_fname
via 3794574 vfs: Convert stream_smb_fname to synthetic_smb_fname
via 987ebb1 vfs: Convert stream_dir to synthetic_smb_fname
via 441467c vfs: Convert fake_acls_sys_acl_delete_def_file to synthetic_smb_fname
via 63f3980 vfs: Convert vfs_gpfs_chmod to synthetic_smb_fname
via 58bb3ae vfs: Convert gpfsacl_emu_chmod to synthetic_smb_fname
via 19e88da vfs: Convert recycle_unlink to synthetic_smb_fname
via 3dafdd3 vfs: Convert streams_xattr_streaminfo to synthetic_smb_fname
via bef6c76 vfs: Convert streams_xattr_open to synthetic_smb_fname
via ec5ac90 vfs: Convert streams_xattr_fstat to synthetic_smb_fname
via 7d57b8a vfs: Convert xattr_tdb_get_file_id to synthetic_smb_fname
via 9b49999 lib: Make create_synthetic_smb_fname_split use synthetic_smb_fname_split
via 8087e70 lib: Add synthetic_smb_fname_split
via 133cde3 lib: Remove unused copy_smb_filename
via 5774989 lib: Make create_synthetic_smb_fname use synthetic_smb_fname
via c1ad695 vfs: Convert hpuxacl_sys_acl_set_file to synthetic_smb_fname
via 855ca77 vfs: Convert afsacl_get_nt_acl to synthetic_smb_fname
via 766f04c lib: Add synthetic_smb_fname
via f50dedb smbd: Make copy_smb_filename static
via b8dd174 smbd: Convert call_trans2setfilepathinfo to cp_smb_filename
via 9a42fe2 smbd: Convert smb_set_file_unix_basic to cp_smb_filename
via 82bf92d smbd: Convert smb_set_file_size to cp_smb_filename
via e2e45bd smbd: Convert call_trans2qfilepathinfo to cp_smb_filename
via 0831de7 smbd: Convert fsp_set_smb_fname to cp_smb_filename
via 1f39074 smbd: Convert copy_file to cp_smb_filename
via a062fb8 smbd: Convert rename_internals_fsp to cp_smb_filename
via 10f45a1 smbd: Convert smbd_dirptr_get_entry to cp_smb_filename
via 988a341 smbd: Convert smbd_smb2_close to cp_smb_filename
via fecf225 vfs: Convert cap_ntimes to cp_smb_filename
via acf70b9 vfs: Convert cap_unlink to cp_smb_filename
via 4d3184e vfs: Convert cap_rename to cp_smb_filename
via fb7afce vfs: Convert alloc_get_client_smb_fname to cp_smb_filename
via e497181 vfs: Convert catia_ntimes to cp_smb_filename
via 7d27464 vfs: Convert catia_unlink to cp_smb_filename
via db4bbc0 vfs: Convert catia_rename to cp_smb_filename
via 6fffea8 vfs: Convert recycle_do_touch to cp_smb_filename
via 79e0050 vfs: Convert recycle_get_file_size to cp_smb_filename
via 36bfe54 vfs: Convert recycle_file_exists to cp_smb_filename
via 9b875f6 vfs: Convert streams_xattr_unlink to cp_smb_filename
via 2c733b2 vfs: Convert xattr_tdb_unlink to cp_smb_filename
via e0e5953 vfs: Convert shadow_copy2_ntimes to cp_smb_filename
via 33037d8 vfs: Convert shadow_copy2_unlink to cp_smb_filename
via 19ee070 vfs: Convert posix_eadb_unlink to cp_smb_filename
via 0221f8b vfs: Convert unlink_acl_tdb to cp_smb_filename
via 8de3c04 lib: Convert copy_smb_filename to use cp_smb_filename
via e1f4942 lib: Add cp_smb_filename
from 0fa404c Bug 9807 - wbinfo: fix segfault in wbinfo_pam_logon
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 406450d44e9c7a31b9db9cdb16c0b404f133d006
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 11:56:59 2013 +0200
smbd: Remove NTSTATUS based create_synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Thu Apr 18 02:52:40 CEST 2013 on sn-devel-104
commit cc0b8351a445243bdefd4b98a31548b2c51e43b8
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 11:55:53 2013 +0200
smbd: Convert create_file_unixpath to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 940ad94906129cf5f65125961470a3a5f41ea78f
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 11:54:46 2013 +0200
smbd: Convert is_visible_file to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 59cfbc7925ee93ef963780085fa9c2c0e08e7421
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 11:53:32 2013 +0200
smbd: Convert dptr_create to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 235a309fc17f029912cbd0608b36a080435ae4b9
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 11:51:59 2013 +0200
smbd: Convert print_spool_open to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit ea519ec5cefba1079e3f67a2b9b58c8f0ca35948
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 11:50:51 2013 +0200
smbd: Convert driver_unlink_internals to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 2b97eb13ff7d97ddd7a4400a8073ea7b00119103
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 11:49:54 2013 +0200
vfstest: Convert cmd_set_nt_acl to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 6f7d9b24d0bf8265c007c2c9745acdabd2e41990
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 11:49:09 2013 +0200
vfstest: Convert cmd_utime to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 6624095d6747432e1e19ee54902a804dcb2c0129
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 11:48:05 2013 +0200
vfstest: Convert cmd_lstat to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 7d5403037ad6d14c912c19a6970ebea9a43c942b
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 11:47:17 2013 +0200
vfstest: Convert cmd_stat to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit a6985e6e678e2ca8867097671192cf3a94e772e1
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 11:46:24 2013 +0200
vfstest: Convert cmd_rename to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 434885a4ac4ba1c75326c847a484e65f7dd16153
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 11:44:35 2013 +0200
vfstest: Convert cmd_pathfunc to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 1f6b0af7e7da0b5fb2d2e52f070caffe643113d2
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 11:43:38 2013 +0200
vfstest: Convert cmd_open to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 0cb056472dc38010ea12aed167ea664c7c5c912a
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 11:42:38 2013 +0200
vfs: Convert dirsort_opendir to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 730c57bf5217057bcf72f12b94f5501bea75ca1c
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 11:41:26 2013 +0200
vfs: Convert vfs_scannedonly to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit d70de0776b9d30f72032900d5f58624998784850
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 11:36:30 2013 +0200
smbd: Convert set_create_timespec_ea to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit fb211c39dbdb026c4294ccfb42e0c648c4464a27
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 11:30:50 2013 +0200
smbd: Convert unix_mode to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit af40d236ea851cab4ad34928fcabf556a153327e
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 11:28:47 2013 +0200
smbd: Convert rmdir_internals to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit f5873c987ca86824863683fcd0f6736880eed4c1
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 11:27:35 2013 +0200
smbd: Convert recursive_rmdir to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 39470c80562fe5b7db41b09e890495f4eba4c709
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 11:25:41 2013 +0200
smbd: Convert delete_all_streams to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 421eeef732a63711b3e922bd63f9ac59110659f1
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 11:23:44 2013 +0200
smbd: Convert open_streams_for_delete to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 66beff7dd0483a5bb7591d7e5e85e5de96b5dbe7
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 11:22:43 2013 +0200
smbd: Convert msg_file_was_renamed to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 39c5a77b0a03916477309332913cd5a346c46472
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 11:21:09 2013 +0200
smbd: Convert change_dir_owner_to_parent to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit d003f2ff8064c5655e13a523e7b2b93b2f56cf60
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 11:12:40 2013 +0200
smbd: Convert change_dir_owner_to_parent to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit c9a220bdaf963fa8a4ede9a3b9eb52b6c10d718e
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 11:11:43 2013 +0200
smbd: Convert change_file_owner_to_parent to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 81e9c0102d1aae9b794addd7e35f9a888d5d66a2
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 11:10:28 2013 +0200
smbd: Convert make_connection_snum to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 10d8d7d0bdea0e472c76241936cbfa70f1a60af8
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 11:09:32 2013 +0200
smbd: Convert rename_internals_fsp to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 862c561ffc3dcb45d80d5fdc314854687e98f525
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 11:08:15 2013 +0200
smbd: Convert remove_msdfs_link to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 576df8742828c676997021cc8a58c2b7168cb0a9
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 11:06:57 2013 +0200
smbd: Convert create_msdfs_link to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 01b8f34e49e4d95935b6c520cbd833b34c6ce792
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 11:05:20 2013 +0200
smbd: Convert can_delete_file_in_directory to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit e3a7f707686973af04afd1022820a4aabdae95ac
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 11:03:44 2013 +0200
smbd: Convert file_new to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 2d76ce3fc0d5fdf7a77512e1d110ca15a1711ba0
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 11:02:19 2013 +0200
smbd: Convert open_dir_with_privilege to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit fe798621314aaba110fb59567ab8a10eac83266e
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 11:00:14 2013 +0200
smbd: Convert open_np_file to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit fa3f2fd83b73b7d7e4fd35894a0fc13d8af1f2be
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 10:55:16 2013 +0200
smbd: Convert smb_file_rename_information to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 419dd4f84475b7f2c290b2682124cea4bc46e8c5
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 10:54:22 2013 +0200
smbd: Convert smb_file_rename_information to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 9cf8d693de5142aa19507bb6dd73c1266e0df00a
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 10:53:16 2013 +0200
smbd: Convert smb2_file_rename_information to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 381bd97f1307e827ff19721808ba303f292a8d4f
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 10:50:53 2013 +0200
smbd: Convert smb_set_file_dosmode to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit edb7293020737b7dc6aeaf98654f58a8d4c34227
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 10:49:46 2013 +0200
smbd: Convert call_trans2qfilepathinfo to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit aa523408b4ba20e70403f819981e4881bdfeaae5
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 15 10:39:45 2013 +0200
smbd: Convert posix_sys_acl_blob_get_file to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 1dc29208f3b9bf7733bdfe19262ab533f813d9fb
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 12 12:14:32 2013 +0200
pysmbd: Convert py_smbd_unlink to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 204d971d892e0aec8a5c0eb8b97b6a9675905bfe
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 12 12:06:51 2013 +0200
pysmbd: Convert set_nt_acl_conn to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 1675bf379c67f695c3826479f0d69109f82da3d4
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 12 11:49:19 2013 +0200
smbd: Convert filename_convert_internal to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 0b147201bd24cc71ed32376961bdfef4b8729dce
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 12 11:47:41 2013 +0200
smbd: Convert vfs_lstat_smb_fname to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 9041f3d6d3bf9ff068687402b6275004b8c18e95
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 12 11:46:15 2013 +0200
smbd: Convert vfs_stat_smb_fname to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit bde53d8c5b6c6cee51f18bf50a1cdbe01e2e99cc
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 12 11:44:38 2013 +0200
smbd: Convert check_reduced_name_with_privilege to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit e0866753ce23d7edb9ca14f825a01f201127f7bb
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 12 11:43:24 2013 +0200
smbd: Convert vfs_GetWd to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 75911f94b860bcc7186390f5372ede3f6f92024e
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 12 11:41:20 2013 +0200
smbd: Convert vfs_default_durable_reconnect to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 97d006ff7d442d718cea95cea4a95404c2da2d9b
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 12 11:39:46 2013 +0200
vfs: Convert non_posix_sys_acl_blob_get_file_helper to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 3d05622c560d2b481c28fa834f3fa2fde288fcce
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 12 11:38:28 2013 +0200
vfs: Convert vfswrap_fs_capabilities to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit a61307489c93e925ed99f0e2409984a794d74fce
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 12 11:37:10 2013 +0200
vfs: Convert streams_depot_streaminfo to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 952d348f872a24e31370ef3dbd176a17bf4d72b5
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 12 11:36:11 2013 +0200
vfs: Convert collect_one_stream to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 83e6ff1511289bc07f9a7e3786efb245363a5646
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 12 11:34:37 2013 +0200
vfs: Convert streams_depot_rmdir to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 87d92093afd0b22bd826eae95881e9714a6dd12e
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 12 11:33:38 2013 +0200
vfs: Convert streams_depot_unlink to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 1729d786928957c37062f19582c52871c12b90b6
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 12 11:31:37 2013 +0200
vfs: Convert streams_depot_open to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 3794574bc159a0c657a1732a6c2d1b47f8166511
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 12 11:28:16 2013 +0200
vfs: Convert stream_smb_fname to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 987ebb15918a10fd17bf784a054499111d4ad4e5
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 12 11:26:27 2013 +0200
vfs: Convert stream_dir to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 441467c26621f245a7f71f4280e2c44afb30118f
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 12 11:22:23 2013 +0200
vfs: Convert fake_acls_sys_acl_delete_def_file to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 63f3980a88e033e118160fc92f95f0bf9bd2fbb2
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 12 11:19:26 2013 +0200
vfs: Convert vfs_gpfs_chmod to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 58bb3ae99d0ccb469676117245b2ffff4abfa333
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 12 11:18:10 2013 +0200
vfs: Convert gpfsacl_emu_chmod to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 19e88da1dcbc553d443b4c224d186ccda09672b6
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 12 11:17:00 2013 +0200
vfs: Convert recycle_unlink to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 3dafdd3c0b9523f65205254b5ad98e8959580f93
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 12 11:15:41 2013 +0200
vfs: Convert streams_xattr_streaminfo to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit bef6c7615c4b2af90fc44b650016f9a1947c1889
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 12 11:14:39 2013 +0200
vfs: Convert streams_xattr_open to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit ec5ac9080b50c8a45c19ddab9069ac6e1e707809
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 12 11:13:32 2013 +0200
vfs: Convert streams_xattr_fstat to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 7d57b8adf27f82d25a9d26eae6d652c9f763fdfa
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 12 11:09:25 2013 +0200
vfs: Convert xattr_tdb_get_file_id to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 9b499996c4d7bdd963f14242ee727adbe14e3aa7
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 12 11:07:56 2013 +0200
lib: Make create_synthetic_smb_fname_split use synthetic_smb_fname_split
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 8087e701ccddc5ea8835292605007cced674a43b
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 12 11:06:45 2013 +0200
lib: Add synthetic_smb_fname_split
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 133cde309381d9e127c8d78167b486dd7cbb0920
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 12 11:01:15 2013 +0200
lib: Remove unused copy_smb_filename
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 5774989336570e89b0976842eb9ea2657f8fc3ed
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 12 11:00:31 2013 +0200
lib: Make create_synthetic_smb_fname use synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit c1ad69556c5ba4477a7c369e369c30def0288d55
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 12 10:56:53 2013 +0200
vfs: Convert hpuxacl_sys_acl_set_file to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 855ca77f8247b2ee028b3d26a1f1f917204f882f
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 12 10:55:54 2013 +0200
vfs: Convert afsacl_get_nt_acl to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 766f04cebd08d5b7056171945a79b7a8cb4de198
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 11 17:01:22 2013 +0200
lib: Add synthetic_smb_fname
The interface of create_synthetic_smb_fname is just silly
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit f50dedb8fb2c654d3e5dccba24fdf79a96525061
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 11 16:46:37 2013 +0200
smbd: Make copy_smb_filename static
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit b8dd1749e30615d26107b99baa264c6d334a8f9d
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 11 16:34:15 2013 +0200
smbd: Convert call_trans2setfilepathinfo to cp_smb_filename
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 9a42fe2d6de50117ea4b0d57819e32d389e787fb
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 11 16:30:38 2013 +0200
smbd: Convert smb_set_file_unix_basic to cp_smb_filename
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 82bf92d08a3e1e208a7e944fa7ada0a56585ad4a
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 11 16:28:53 2013 +0200
smbd: Convert smb_set_file_size to cp_smb_filename
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit e2e45bd9cd6fa9a48fe8be15da4406dfcc55057a
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 11 16:27:48 2013 +0200
smbd: Convert call_trans2qfilepathinfo to cp_smb_filename
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 0831de71e761e2f764d9ad091b39ce76bc3b67da
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 11 16:26:45 2013 +0200
smbd: Convert fsp_set_smb_fname to cp_smb_filename
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 1f39074b8338855033ffc1484e56ede6a86f6c1a
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 11 16:25:10 2013 +0200
smbd: Convert copy_file to cp_smb_filename
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit a062fb813e7e85cf9d493126e14dd62abb8f87e1
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 11 16:23:53 2013 +0200
smbd: Convert rename_internals_fsp to cp_smb_filename
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 10f45a16b20204d79e1f6a24724da01137f30e60
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 11 16:22:38 2013 +0200
smbd: Convert smbd_dirptr_get_entry to cp_smb_filename
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 988a341d25bf76e80c8ad73c668200869fae6774
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 11 16:20:29 2013 +0200
smbd: Convert smbd_smb2_close to cp_smb_filename
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit fecf225068e1f6127f55db63a32b8f29bdae51ff
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 11 16:18:39 2013 +0200
vfs: Convert cap_ntimes to cp_smb_filename
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit acf70b9e068e862be40fe69d5b74da6d8728c987
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 11 16:17:42 2013 +0200
vfs: Convert cap_unlink to cp_smb_filename
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 4d3184e96c5fc2e77df83556cfa9ed6a13448b72
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 11 16:16:58 2013 +0200
vfs: Convert cap_rename to cp_smb_filename
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit fb7afce2d36bc0b13b4918675ba0a9360b1f5d02
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 11 16:14:05 2013 +0200
vfs: Convert alloc_get_client_smb_fname to cp_smb_filename
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit e49718111e4b2586136d60bb312ef35e58b6e48c
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 11 16:12:13 2013 +0200
vfs: Convert catia_ntimes to cp_smb_filename
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 7d274641726d1572243968b708a102bb9a15a15c
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 11 16:11:26 2013 +0200
vfs: Convert catia_unlink to cp_smb_filename
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit db4bbc0c4f8e57396cf81432876df59d238363d5
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 11 16:10:22 2013 +0200
vfs: Convert catia_rename to cp_smb_filename
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 6fffea81acd4a991aed57bdc126338b9ae8e4863
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 11 15:40:10 2013 +0200
vfs: Convert recycle_do_touch to cp_smb_filename
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 79e005072e2c466af95013992eb89e19993e2d39
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 11 15:38:41 2013 +0200
vfs: Convert recycle_get_file_size to cp_smb_filename
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 36bfe54c3b9c2ac54c6ff3b19d8eee57f03627fe
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 11 15:37:38 2013 +0200
vfs: Convert recycle_file_exists to cp_smb_filename
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 9b875f62448dda0ff2283d7a4729542ccf6335ab
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 11 15:36:18 2013 +0200
vfs: Convert streams_xattr_unlink to cp_smb_filename
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 2c733b2ffb72b972e2b176d3b32b1e5c6c1b3bad
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 11 15:35:02 2013 +0200
vfs: Convert xattr_tdb_unlink to cp_smb_filename
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit e0e5953494e08849e59b570c77c286a08d7d15bd
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 11 15:33:44 2013 +0200
vfs: Convert shadow_copy2_ntimes to cp_smb_filename
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 33037d80d5f6bf551809c05abea75f0a7d2ddf17
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 11 15:32:39 2013 +0200
vfs: Convert shadow_copy2_unlink to cp_smb_filename
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 19ee0708538a2358584de2a5498a470c5a168ec3
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 11 15:31:27 2013 +0200
vfs: Convert posix_eadb_unlink to cp_smb_filename
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 0221f8bb90d80589d65f48ac43ce0cb301ac509f
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 11 15:29:55 2013 +0200
vfs: Convert unlink_acl_tdb to cp_smb_filename
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 8de3c04de346c120ca5ac396008d71eae708071f
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 11 15:26:34 2013 +0200
lib: Convert copy_smb_filename to use cp_smb_filename
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit e1f4942a07ef20f3540a47dd08a7a64dbd469398
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 11 15:24:55 2013 +0200
lib: Add cp_smb_filename
The interface of copy_smb_filename is just silly ;-)
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/include/proto.h | 20 +++----
source3/lib/filename_util.c | 106 ++++++++++++++++-------------------
source3/modules/non_posix_acls.c | 11 ++--
source3/modules/vfs_acl_tdb.c | 7 +-
source3/modules/vfs_afsacl.c | 7 +-
source3/modules/vfs_cap.c | 31 ++++------
source3/modules/vfs_catia.c | 25 ++++----
source3/modules/vfs_default.c | 10 +--
source3/modules/vfs_dirsort.c | 9 +--
source3/modules/vfs_fake_acls.c | 10 ++--
source3/modules/vfs_gpfs.c | 16 +++--
source3/modules/vfs_hpuxacl.c | 6 +-
source3/modules/vfs_media_harmony.c | 7 +-
source3/modules/vfs_posix_eadb.c | 9 ++-
source3/modules/vfs_recycle.c | 23 +++-----
source3/modules/vfs_scannedonly.c | 28 ++++-----
source3/modules/vfs_shadow_copy2.c | 10 +--
source3/modules/vfs_streams_depot.c | 83 ++++++++++++----------------
source3/modules/vfs_streams_xattr.c | 36 +++++-------
source3/modules/vfs_xattr_tdb.c | 19 +++---
source3/printing/nt_printing.c | 5 +-
source3/printing/printspoolss.c | 6 +-
source3/smbd/close.c | 30 ++++------
source3/smbd/dir.c | 36 +++++-------
source3/smbd/dosmode.c | 27 ++++-----
source3/smbd/durable.c | 10 +--
source3/smbd/file_access.c | 8 +--
source3/smbd/filename.c | 10 ++-
source3/smbd/files.c | 14 ++---
source3/smbd/msdfs.c | 25 +++-----
source3/smbd/open.c | 51 ++++++++---------
source3/smbd/pipes.c | 7 +-
source3/smbd/posix_acls.c | 11 ++--
source3/smbd/pysmbd.c | 14 ++---
source3/smbd/reply.c | 19 +++---
source3/smbd/service.c | 7 +-
source3/smbd/smb2_close.c | 8 +--
source3/smbd/trans2.c | 79 ++++++++++++--------------
source3/smbd/vfs.c | 43 ++++++--------
source3/torture/cmd_vfs.c | 63 ++++++++------------
40 files changed, 417 insertions(+), 529 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 00a9a69..83ab77a 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1597,20 +1597,18 @@ bool lookup_unix_group_name(const char *name, struct dom_sid *sid);
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);
+struct smb_filename *synthetic_smb_fname(TALLOC_CTX *mem_ctx,
+ const char *base_name,
+ const char *stream_name,
+ const SMB_STRUCT_STAT *psbuf);
+struct smb_filename *synthetic_smb_fname_split(TALLOC_CTX *ctx,
+ const char *fname,
+ const SMB_STRUCT_STAT *psbuf);
const char *smb_fname_str_dbg(const struct smb_filename *smb_fname);
const char *fsp_str_dbg(const struct files_struct *fsp);
const char *fsp_fnum_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);
+struct smb_filename *cp_smb_filename(TALLOC_CTX *mem_ctx,
+ const struct smb_filename *in);
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);
diff --git a/source3/lib/filename_util.c b/source3/lib/filename_util.c
index 9a6ab2b..656dd2a 100644
--- a/source3/lib/filename_util.c
+++ b/source3/lib/filename_util.c
@@ -50,14 +50,12 @@ NTSTATUS get_full_smb_filename(TALLOC_CTX *ctx,
* enumerate streams using the vfs_streaminfo interface and then want to
* operate on each stream.
*/
-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)
+struct smb_filename *synthetic_smb_fname(TALLOC_CTX *mem_ctx,
+ const char *base_name,
+ const char *stream_name,
+ const SMB_STRUCT_STAT *psbuf)
{
- struct smb_filename smb_fname_loc;
-
- ZERO_STRUCT(smb_fname_loc);
+ struct smb_filename smb_fname_loc = { 0, };
/* Setup the base_name/stream_name. */
smb_fname_loc.base_name = discard_const_p(char, base_name);
@@ -67,22 +65,21 @@ NTSTATUS create_synthetic_smb_fname(TALLOC_CTX *ctx, const char *base_name,
if (psbuf)
smb_fname_loc.st = *psbuf;
- /* Let copy_smb_filename() do the heavy lifting. */
- return copy_smb_filename(ctx, &smb_fname_loc, smb_fname_out);
+ /* Let cp_smb_filename() do the heavy lifting. */
+ return cp_smb_filename(mem_ctx, &smb_fname_loc);
}
/**
* XXX: This is temporary and there should be no callers of this once
* smb_filename is plumbed through all path based operations.
*/
-NTSTATUS create_synthetic_smb_fname_split(TALLOC_CTX *ctx,
- const char *fname,
- const SMB_STRUCT_STAT *psbuf,
- struct smb_filename **smb_fname_out)
+struct smb_filename *synthetic_smb_fname_split(TALLOC_CTX *ctx,
+ const char *fname,
+ const SMB_STRUCT_STAT *psbuf)
{
- NTSTATUS status;
const char *stream_name = NULL;
char *base_name = NULL;
+ struct smb_filename *ret;
if (!lp_posix_pathnames()) {
stream_name = strchr_m(fname, ':');
@@ -97,13 +94,12 @@ NTSTATUS create_synthetic_smb_fname_split(TALLOC_CTX *ctx,
}
if (!base_name) {
- return NT_STATUS_NO_MEMORY;
+ return NULL;
}
- status = create_synthetic_smb_fname(ctx, base_name, stream_name, psbuf,
- smb_fname_out);
+ ret = synthetic_smb_fname(ctx, base_name, stream_name, psbuf);
TALLOC_FREE(base_name);
- return status;
+ return ret;
}
/**
@@ -161,47 +157,43 @@ const char *fsp_fnum_dbg(const struct files_struct *fsp)
return str;
}
-NTSTATUS copy_smb_filename(TALLOC_CTX *ctx,
- const struct smb_filename *smb_fname_in,
- struct smb_filename **smb_fname_out)
+struct smb_filename *cp_smb_filename(TALLOC_CTX *mem_ctx,
+ const struct smb_filename *in)
{
- /* stream_name must always be NULL if there is no stream. */
- if (smb_fname_in->stream_name) {
- SMB_ASSERT(smb_fname_in->stream_name[0] != '\0');
- }
+ struct smb_filename *out;
- *smb_fname_out = talloc_zero(ctx, struct smb_filename);
- if (*smb_fname_out == NULL) {
- return NT_STATUS_NO_MEMORY;
- }
-
- if (smb_fname_in->base_name) {
- (*smb_fname_out)->base_name =
- talloc_strdup(*smb_fname_out, smb_fname_in->base_name);
- if (!(*smb_fname_out)->base_name)
- goto no_mem_err;
- }
-
- if (smb_fname_in->stream_name) {
- (*smb_fname_out)->stream_name =
- talloc_strdup(*smb_fname_out, smb_fname_in->stream_name);
- if (!(*smb_fname_out)->stream_name)
- goto no_mem_err;
- }
-
- if (smb_fname_in->original_lcomp) {
- (*smb_fname_out)->original_lcomp =
- talloc_strdup(*smb_fname_out, smb_fname_in->original_lcomp);
- if (!(*smb_fname_out)->original_lcomp)
- goto no_mem_err;
- }
-
- (*smb_fname_out)->st = smb_fname_in->st;
- return NT_STATUS_OK;
-
- no_mem_err:
- TALLOC_FREE(*smb_fname_out);
- return NT_STATUS_NO_MEMORY;
+ /* stream_name must always be NULL if there is no stream. */
+ if (in->stream_name) {
+ SMB_ASSERT(in->stream_name[0] != '\0');
+ }
+
+ out = talloc_zero(mem_ctx, struct smb_filename);
+ if (out == NULL) {
+ return NULL;
+ }
+ if (in->base_name != NULL) {
+ out->base_name = talloc_strdup(out, in->base_name);
+ if (out->base_name == NULL) {
+ goto fail;
+ }
+ }
+ if (in->stream_name != NULL) {
+ out->stream_name = talloc_strdup(out, in->stream_name);
+ if (out->stream_name == NULL) {
+ goto fail;
+ }
+ }
+ if (in->original_lcomp != NULL) {
+ out->original_lcomp = talloc_strdup(out, in->original_lcomp);
+ if (out->original_lcomp == NULL) {
+ goto fail;
+ }
+ }
+ out->st = in->st;
+ return out;
+fail:
+ TALLOC_FREE(out);
+ return NULL;
}
/****************************************************************************
diff --git a/source3/modules/non_posix_acls.c b/source3/modules/non_posix_acls.c
index 6c1dfbf..b1c2420 100644
--- a/source3/modules/non_posix_acls.c
+++ b/source3/modules/non_posix_acls.c
@@ -30,13 +30,12 @@ int non_posix_sys_acl_blob_get_file_helper(vfs_handle_struct *handle,
int ret;
TALLOC_CTX *frame = talloc_stackframe();
struct xattr_sys_acl_hash_wrapper acl_wrapper = {};
- struct smb_filename *smb_fname = NULL;
- NTSTATUS status = create_synthetic_smb_fname_split(frame, path_p,
- NULL,
- &smb_fname);
- if (!NT_STATUS_IS_OK(status)) {
- errno = map_errno_from_nt_status(status);
+ struct smb_filename *smb_fname;
+
+ smb_fname = synthetic_smb_fname_split(frame, path_p, NULL);
+ if (smb_fname == NULL) {
TALLOC_FREE(frame);
+ errno = ENOMEM;
return -1;
}
diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c
index f68afd8..80839e3 100644
--- a/source3/modules/vfs_acl_tdb.c
+++ b/source3/modules/vfs_acl_tdb.c
@@ -242,12 +242,11 @@ static int unlink_acl_tdb(vfs_handle_struct *handle,
{
struct smb_filename *smb_fname_tmp = NULL;
struct db_context *db = acl_db;
- NTSTATUS status;
int ret = -1;
- status = copy_smb_filename(talloc_tos(), smb_fname, &smb_fname_tmp);
- if (!NT_STATUS_IS_OK(status)) {
- errno = map_errno_from_nt_status(status);
+ smb_fname_tmp = cp_smb_filename(talloc_tos(), smb_fname);
+ if (smb_fname_tmp == NULL) {
+ errno = ENOMEM;
goto out;
}
diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c
index 66e256c..b03d06d 100644
--- a/source3/modules/vfs_afsacl.c
+++ b/source3/modules/vfs_afsacl.c
@@ -1050,11 +1050,10 @@ static NTSTATUS afsacl_get_nt_acl(struct vfs_handle_struct *handle,
return NT_STATUS_ACCESS_DENIED;
}
- status = create_synthetic_smb_fname(talloc_tos(), name, NULL, NULL,
- &smb_fname);
- if (!NT_STATUS_IS_OK(status)) {
+ smb_fname = synthetic_smb_fname(talloc_tos(), name, NULL, NULL);
+ if (smb_fname == NULL) {
free_afs_acl(&acl);
- return status;
+ return NT_STATUS_NO_MEMORY;
}
sd_size = afs_to_nt_acl(&acl, handle->conn, smb_fname, security_info,
diff --git a/source3/modules/vfs_cap.c b/source3/modules/vfs_cap.c
index f2f8d71..c52e30c 100644
--- a/source3/modules/vfs_cap.c
+++ b/source3/modules/vfs_cap.c
@@ -143,7 +143,6 @@ static int cap_rename(vfs_handle_struct *handle,
char *capnew = NULL;
struct smb_filename *smb_fname_src_tmp = NULL;
struct smb_filename *smb_fname_dst_tmp = NULL;
- NTSTATUS status;
int ret = -1;
capold = capencode(talloc_tos(), smb_fname_src->base_name);
@@ -154,16 +153,14 @@ static int cap_rename(vfs_handle_struct *handle,
}
/* Setup temporary smb_filename structs. */
- status = copy_smb_filename(talloc_tos(), smb_fname_src,
- &smb_fname_src_tmp);
- if (!NT_STATUS_IS_OK(status)) {
- errno = map_errno_from_nt_status(status);
+ smb_fname_src_tmp = cp_smb_filename(talloc_tos(), smb_fname_src);
+ if (smb_fname_src_tmp == NULL) {
+ errno = ENOMEM;
goto out;
}
- status = copy_smb_filename(talloc_tos(), smb_fname_dst,
- &smb_fname_dst_tmp);
- if (!NT_STATUS_IS_OK(status)) {
- errno = map_errno_from_nt_status(status);
+ smb_fname_dst_tmp = cp_smb_filename(talloc_tos(), smb_fname_dst);
+ if (smb_fname_dst_tmp == NULL) {
+ errno = ENOMEM;
goto out;
}
@@ -234,7 +231,6 @@ static int cap_unlink(vfs_handle_struct *handle,
{
struct smb_filename *smb_fname_tmp = NULL;
char *cappath = NULL;
- NTSTATUS status;
int ret;
cappath = capencode(talloc_tos(), smb_fname->base_name);
@@ -244,10 +240,9 @@ static int cap_unlink(vfs_handle_struct *handle,
}
/* Setup temporary smb_filename structs. */
- status = copy_smb_filename(talloc_tos(), smb_fname,
- &smb_fname_tmp);
- if (!NT_STATUS_IS_OK(status)) {
- errno = map_errno_from_nt_status(status);
+ smb_fname_tmp = cp_smb_filename(talloc_tos(), smb_fname);
+ if (smb_fname_tmp == NULL) {
+ errno = ENOMEM;
return -1;
}
@@ -310,7 +305,6 @@ static int cap_ntimes(vfs_handle_struct *handle,
{
struct smb_filename *smb_fname_tmp = NULL;
char *cappath = NULL;
- NTSTATUS status;
int ret;
cappath = capencode(talloc_tos(), smb_fname->base_name);
@@ -321,10 +315,9 @@ static int cap_ntimes(vfs_handle_struct *handle,
}
/* Setup temporary smb_filename structs. */
- status = copy_smb_filename(talloc_tos(), smb_fname,
- &smb_fname_tmp);
- if (!NT_STATUS_IS_OK(status)) {
- errno = map_errno_from_nt_status(status);
+ smb_fname_tmp = cp_smb_filename(talloc_tos(), smb_fname);
+ if (smb_fname_tmp == NULL) {
+ errno = ENOMEM;
return -1;
}
diff --git a/source3/modules/vfs_catia.c b/source3/modules/vfs_catia.c
index f7c0e7b..3d710bd 100644
--- a/source3/modules/vfs_catia.c
+++ b/source3/modules/vfs_catia.c
@@ -393,16 +393,15 @@ static int catia_rename(vfs_handle_struct *handle,
}
/* Setup temporary smb_filename structs. */
- status = copy_smb_filename(ctx, smb_fname_src, &smb_fname_src_tmp);
-
- if (!NT_STATUS_IS_OK(status)) {
- errno = map_errno_from_nt_status(status);
+ smb_fname_src_tmp = cp_smb_filename(ctx, smb_fname_src);
+ if (smb_fname_src_tmp == NULL) {
+ errno = ENOMEM;
goto out;
}
- status = copy_smb_filename(ctx, smb_fname_dst, &smb_fname_dst_tmp);
- if (!NT_STATUS_IS_OK(status)) {
- errno = map_errno_from_nt_status(status);
+ smb_fname_dst_tmp = cp_smb_filename(ctx, smb_fname_dst);
+ if (smb_fname_dst_tmp == NULL) {
+ errno = ENOMEM;
goto out;
}
@@ -492,9 +491,9 @@ static int catia_unlink(vfs_handle_struct *handle,
}
/* Setup temporary smb_filename structs. */
- status = copy_smb_filename(talloc_tos(), smb_fname, &smb_fname_tmp);
- if (!NT_STATUS_IS_OK(status)) {
- errno = map_errno_from_nt_status(status);
+ smb_fname_tmp = cp_smb_filename(talloc_tos(), smb_fname);
+ if (smb_fname_tmp == NULL) {
+ errno = ENOMEM;
return -1;
}
@@ -628,9 +627,9 @@ static int catia_ntimes(vfs_handle_struct *handle,
return -1;
}
- status = copy_smb_filename(talloc_tos(), smb_fname, &smb_fname_tmp);
- if (!NT_STATUS_IS_OK(status)) {
- errno = map_errno_from_nt_status(status);
+ smb_fname_tmp = cp_smb_filename(talloc_tos(), smb_fname);
+ if (smb_fname_tmp == NULL) {
+ errno = ENOMEM;
return -1;
}
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 8a03ea3..8804e62 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -113,7 +113,6 @@ static uint32_t vfswrap_fs_capabilities(struct vfs_handle_struct *handle,
uint32_t caps = FILE_CASE_SENSITIVE_SEARCH | FILE_CASE_PRESERVED_NAMES;
struct smb_filename *smb_fname_cpath = NULL;
struct vfs_statvfs_struct statbuf;
- NTSTATUS status;
int ret;
ZERO_STRUCT(statbuf);
@@ -127,12 +126,9 @@ static uint32_t vfswrap_fs_capabilities(struct vfs_handle_struct *handle,
/* Work out what timestamp resolution we can
* use when setting a timestamp. */
- status = create_synthetic_smb_fname(talloc_tos(),
- conn->connectpath,
- NULL,
- NULL,
- &smb_fname_cpath);
- if (!NT_STATUS_IS_OK(status)) {
+ smb_fname_cpath = synthetic_smb_fname(talloc_tos(), conn->connectpath,
+ NULL, NULL);
+ if (smb_fname_cpath == NULL) {
return caps;
}
diff --git a/source3/modules/vfs_dirsort.c b/source3/modules/vfs_dirsort.c
index 64d74d5..2c25765 100644
--- a/source3/modules/vfs_dirsort.c
+++ b/source3/modules/vfs_dirsort.c
@@ -119,7 +119,6 @@ static DIR *dirsort_opendir(vfs_handle_struct *handle,
const char *fname, const char *mask,
uint32 attr)
{
- NTSTATUS status;
struct dirsort_privates *data = NULL;
/* set up our private data about this directory */
@@ -128,12 +127,8 @@ static DIR *dirsort_opendir(vfs_handle_struct *handle,
return NULL;
}
- status = create_synthetic_smb_fname(data,
- fname,
- NULL,
- NULL,
- &data->smb_fname);
- if (!NT_STATUS_IS_OK(status)) {
+ data->smb_fname = synthetic_smb_fname(data, fname, NULL, NULL);
+ if (data->smb_fname == NULL) {
TALLOC_FREE(data);
return NULL;
}
diff --git a/source3/modules/vfs_fake_acls.c b/source3/modules/vfs_fake_acls.c
index 9954af4..0e7ebb9 100644
--- a/source3/modules/vfs_fake_acls.c
+++ b/source3/modules/vfs_fake_acls.c
@@ -346,12 +346,12 @@ static int fake_acls_sys_acl_delete_def_file(vfs_handle_struct *handle, const ch
int ret;
const char *name = FAKE_ACL_DEFAULT_XATTR;
TALLOC_CTX *frame = talloc_stackframe();
- struct smb_filename *smb_fname = NULL;
- NTSTATUS status = create_synthetic_smb_fname_split(frame, path, NULL,
- &smb_fname);
- if (!NT_STATUS_IS_OK(status)) {
- errno = map_errno_from_nt_status(status);
+ struct smb_filename *smb_fname;
+
+ smb_fname = synthetic_smb_fname_split(frame, path, NULL);
+ if (smb_fname == NULL) {
TALLOC_FREE(frame);
+ errno = ENOMEM;
return -1;
}
diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index f4db292..674e101 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -1163,10 +1163,10 @@ static int gpfsacl_emu_chmod(const char *path, mode_t mode)
/* don't add complementary DENY ACEs here */
ZERO_STRUCT(fake_fsp);
- status = create_synthetic_smb_fname(talloc_tos(), path, NULL, NULL,
- &fake_fsp.fsp_name);
- if (!NT_STATUS_IS_OK(status)) {
- errno = map_errno_from_nt_status(status);
+ fake_fsp.fsp_name = synthetic_smb_fname(
+ talloc_tos(), path, NULL, NULL);
+ if (fake_fsp.fsp_name == NULL) {
+ errno = ENOMEM;
return -1;
}
/* put the acl */
@@ -1183,10 +1183,12 @@ static int vfs_gpfs_chmod(vfs_handle_struct *handle, const char *path, mode_t mo
{
struct smb_filename *smb_fname_cpath;
int rc;
- NTSTATUS status;
- status = create_synthetic_smb_fname(
- talloc_tos(), path, NULL, NULL, &smb_fname_cpath);
+ smb_fname_cpath = synthetic_smb_fname(talloc_tos(), path, NULL, NULL);
+ if (smb_fname_cpath == NULL) {
+ errno = ENOMEM;
+ return -1;
+ }
if (SMB_VFS_NEXT_STAT(handle, smb_fname_cpath) != 0) {
return -1;
diff --git a/source3/modules/vfs_hpuxacl.c b/source3/modules/vfs_hpuxacl.c
index a05ca44..7ffb847 100644
--- a/source3/modules/vfs_hpuxacl.c
+++ b/source3/modules/vfs_hpuxacl.c
@@ -221,9 +221,9 @@ int hpuxacl_sys_acl_set_file(vfs_handle_struct *handle,
DEBUG(10, ("hpuxacl_sys_acl_set_file called for file '%s'\n",
name));
--
Samba Shared Repository
More information about the samba-cvs
mailing list