The branch, master has been updated via 7b55ec2 s4-provision: Fix up --use-s3fs to create the directory for xattr.tdb via b6b4364 s4-wintest: --use-s3fs in wintest via 63f2d10 s4-provision: Fix --use-s3fs to parse correctly via 9712912 testsuite/libsmbclient: Remove unused and expensive-to-link testsuite via 3408c1c selftest: 'store dos attributes = yes' is now set in fileserver.conf via 0510422 s4-provision: set 'dcerpc endpoint servers' but not 'vfs objects' via 692b3bf file_server: set 'store dos attributes = yes' from 5763301 selftest: run more raw.samba3 against secshare simple file server
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 7b55ec290e2085cf928a467f2e7a9650e11cc0af Author: Andrew Bartlett <abart...@samba.org> Date: Wed May 2 10:45:51 2012 +1000 s4-provision: Fix up --use-s3fs to create the directory for xattr.tdb Autobuild-User: Andrew Bartlett <abart...@samba.org> Autobuild-Date: Wed May 2 04:45:05 CEST 2012 on sn-devel-104 commit b6b4364a3d08b9c5d5b03338e24bf14afff9632b Author: Andrew Bartlett <abart...@samba.org> Date: Wed May 2 10:45:15 2012 +1000 s4-wintest: --use-s3fs in wintest commit 63f2d1060eb889e755078bb2b52dec3909ad4792 Author: Andrew Bartlett <abart...@samba.org> Date: Wed May 2 10:44:45 2012 +1000 s4-provision: Fix --use-s3fs to parse correctly commit 9712912dfcdb7894ab1111bf67572ba0f6d3d5de Author: Andrew Bartlett <abart...@samba.org> Date: Wed May 2 09:49:19 2012 +1000 testsuite/libsmbclient: Remove unused and expensive-to-link testsuite This testsuite never got off the ground, and unlike the other libsmbclient tests, it is not integrated into make test, has no driver script we could integrate. As it has been in this state for 10 years, and adding it to the compile did not find any link-time issues (particularly in comparison to the link-time cost for so many individual binaries), I am now removing them. The libsmbclient examples are seperate to this, and remain in examples/libsmbclient. Andrew Bartlett commit 3408c1ce6c79ae887255ebc14104814365d28a2b Author: Andrew Bartlett <abart...@samba.org> Date: Wed May 2 09:39:33 2012 +1000 selftest: 'store dos attributes = yes' is now set in fileserver.conf As such, there is no need to set it or the permissions-based mappings here as well. Andrew Bartlett commit 051042229db70f6272132c259fb69adc74fb8648 Author: Andrew Bartlett <abart...@samba.org> Date: Wed May 2 09:38:39 2012 +1000 s4-provision: set 'dcerpc endpoint servers' but not 'vfs objects' The VFS objects are now set in the fileserver.conf, but this is only read by smbd, so the provision-time smb.conf needs to turn off the extra Samba4 DCE/RPC services. Andrew Bartlett commit 692b3bfd7feac632a7af3bb1df76116ffb14eea9 Author: Andrew Bartlett <abart...@samba.org> Date: Wed May 2 09:37:08 2012 +1000 file_server: set 'store dos attributes = yes' This means we do not need the old permissions-based mappings. Andrew Bartlett ----------------------------------------------------------------------- Summary of changes: file_server/file_server.c | 5 + selftest/target/Samba4.pm | 4 - .../scripting/python/samba/provision/__init__.py | 14 +- source4/setup/provision | 2 +- testsuite/libsmbclient/src/Makefile | 854 -------------------- testsuite/libsmbclient/src/chmod/chmod_1.c | 59 -- testsuite/libsmbclient/src/chown/chown_1.c | 59 -- testsuite/libsmbclient/src/close/close_1.c | 59 -- testsuite/libsmbclient/src/close/close_2.c | 57 -- testsuite/libsmbclient/src/closedir/closedir_1.c | 65 -- testsuite/libsmbclient/src/closedir/closedir_2.c | 61 -- testsuite/libsmbclient/src/closedir/closedir_3.c | 63 -- testsuite/libsmbclient/src/closedir/closedir_4.c | 59 -- testsuite/libsmbclient/src/creat/creat_1.c | 60 -- testsuite/libsmbclient/src/creat/creat_2.c | 63 -- testsuite/libsmbclient/src/creat/creat_3.c | 56 -- testsuite/libsmbclient/src/fstat/fstat_1.c | 62 -- testsuite/libsmbclient/src/fstat/fstat_2.c | 58 -- testsuite/libsmbclient/src/fstat/fstat_3.c | 69 -- testsuite/libsmbclient/src/fstat/fstat_4.c | 69 -- testsuite/libsmbclient/src/fstat/fstat_5.c | 77 -- testsuite/libsmbclient/src/fstat/fstat_6.c | 80 -- testsuite/libsmbclient/src/getdents/getdents_1.c | 72 -- testsuite/libsmbclient/src/getdents/getdents_2.c | 67 -- testsuite/libsmbclient/src/getdents/getdents_3.c | 155 ---- testsuite/libsmbclient/src/getdents/getdents_4.c | 101 --- testsuite/libsmbclient/src/getdents/getdents_5.c | 106 --- testsuite/libsmbclient/src/init/init_1.c | 18 - testsuite/libsmbclient/src/init/init_2.c | 23 - testsuite/libsmbclient/src/init/init_3.c | 58 -- testsuite/libsmbclient/src/init/init_4.c | 18 - .../src/list_print_jobs/list_print_jobs_1.c | 109 --- .../src/list_print_jobs/list_print_jobs_2.c | 105 --- .../src/list_print_jobs/list_print_jobs_3.c | 103 --- .../src/list_print_jobs/list_print_jobs_4.c | 99 --- .../src/list_print_jobs/list_print_jobs_5.c | 101 --- .../src/list_print_jobs/list_print_jobs_6.c | 110 --- .../src/list_print_jobs/list_print_jobs_7.c | 106 --- testsuite/libsmbclient/src/lseek/lseek_1.c | 61 -- testsuite/libsmbclient/src/lseek/lseek_2.c | 57 -- testsuite/libsmbclient/src/lseek/lseek_3.c | 80 -- testsuite/libsmbclient/src/lseek/lseek_4.c | 80 -- testsuite/libsmbclient/src/lseek/lseek_5.c | 80 -- testsuite/libsmbclient/src/lseek/lseek_6.c | 75 -- testsuite/libsmbclient/src/lseek/lseek_7.c | 80 -- testsuite/libsmbclient/src/lseek/lseek_8.c | 75 -- testsuite/libsmbclient/src/lseekdir/lseekdir_1.c | 102 --- testsuite/libsmbclient/src/lseekdir/lseekdir_2.c | 95 --- testsuite/libsmbclient/src/lseekdir/lseekdir_3.c | 67 -- testsuite/libsmbclient/src/lseekdir/lseekdir_4.c | 61 -- testsuite/libsmbclient/src/lseekdir/lseekdir_5.c | 119 --- testsuite/libsmbclient/src/lseekdir/lseekdir_6.c | 126 --- testsuite/libsmbclient/src/mkdir/mkdir_1.c | 60 -- testsuite/libsmbclient/src/mkdir/mkdir_2.c | 56 -- testsuite/libsmbclient/src/mkdir/mkdir_3.c | 58 -- testsuite/libsmbclient/src/mkdir/mkdir_4.c | 62 -- testsuite/libsmbclient/src/open/open_1.c | 60 -- testsuite/libsmbclient/src/open/open_2.c | 56 -- testsuite/libsmbclient/src/open/open_3.c | 60 -- testsuite/libsmbclient/src/open/open_4.c | 63 -- testsuite/libsmbclient/src/open/open_5.c | 58 -- .../src/open_print_job/open_print_job_1.c | 60 -- .../src/open_print_job/open_print_job_2.c | 56 -- testsuite/libsmbclient/src/opendir/opendir_1.c | 62 -- testsuite/libsmbclient/src/opendir/opendir_2.c | 55 -- testsuite/libsmbclient/src/opendir/opendir_3.c | 65 -- testsuite/libsmbclient/src/opendir/opendir_4.c | 61 -- .../libsmbclient/src/print_file/print_file_1.c | 76 -- .../libsmbclient/src/print_file/print_file_2.c | 72 -- .../libsmbclient/src/print_file/print_file_3.c | 59 -- .../libsmbclient/src/print_file/print_file_4.c | 55 -- testsuite/libsmbclient/src/read/read_1.c | 83 -- testsuite/libsmbclient/src/read/read_10.c | 68 -- testsuite/libsmbclient/src/read/read_11.c | 83 -- testsuite/libsmbclient/src/read/read_12.c | 87 -- testsuite/libsmbclient/src/read/read_13.c | 91 --- testsuite/libsmbclient/src/read/read_2.c | 76 -- testsuite/libsmbclient/src/read/read_3.c | 83 -- testsuite/libsmbclient/src/read/read_4.c | 77 -- testsuite/libsmbclient/src/read/read_5.c | 83 -- testsuite/libsmbclient/src/read/read_6.c | 77 -- testsuite/libsmbclient/src/read/read_7.c | 60 -- testsuite/libsmbclient/src/read/read_8.c | 56 -- testsuite/libsmbclient/src/read/read_9.c | 70 -- testsuite/libsmbclient/src/readdir/readdir_1.c | 107 --- testsuite/libsmbclient/src/readdir/readdir_2.c | 102 --- testsuite/libsmbclient/src/readdir/readdir_3.c | 71 -- testsuite/libsmbclient/src/readdir/readdir_4.c | 67 -- testsuite/libsmbclient/src/readdir/readdir_5.c | 155 ---- testsuite/libsmbclient/src/rename/rename_1.c | 57 -- testsuite/libsmbclient/src/rename/rename_10.c | 64 -- testsuite/libsmbclient/src/rename/rename_11.c | 63 -- testsuite/libsmbclient/src/rename/rename_12.c | 58 -- testsuite/libsmbclient/src/rename/rename_13.c | 63 -- testsuite/libsmbclient/src/rename/rename_14.c | 58 -- testsuite/libsmbclient/src/rename/rename_2.c | 54 -- testsuite/libsmbclient/src/rename/rename_3.c | 56 -- testsuite/libsmbclient/src/rename/rename_4.c | 55 -- testsuite/libsmbclient/src/rename/rename_5.c | 59 -- testsuite/libsmbclient/src/rename/rename_6.c | 57 -- testsuite/libsmbclient/src/rename/rename_7.c | 66 -- testsuite/libsmbclient/src/rename/rename_8.c | 68 -- testsuite/libsmbclient/src/rename/rename_9.c | 68 -- testsuite/libsmbclient/src/rmdir/rmdir_1.c | 59 -- testsuite/libsmbclient/src/rmdir/rmdir_2.c | 55 -- testsuite/libsmbclient/src/rmdir/rmdir_3.c | 61 -- testsuite/libsmbclient/src/rmdir/rmdir_4.c | 57 -- testsuite/libsmbclient/src/rmdir/rmdir_5.c | 63 -- testsuite/libsmbclient/src/rmdir/rmdir_6.c | 59 -- testsuite/libsmbclient/src/stat/stat_1.c | 62 -- testsuite/libsmbclient/src/stat/stat_2.c | 58 -- testsuite/libsmbclient/src/stat/stat_3.c | 66 -- testsuite/libsmbclient/src/stat/stat_4.c | 62 -- testsuite/libsmbclient/src/stat/stat_5.c | 77 -- testsuite/libsmbclient/src/stat/stat_6.c | 80 -- testsuite/libsmbclient/src/stat/stat_k.c | 91 --- testsuite/libsmbclient/src/telldir/telldir_1.c | 102 --- testsuite/libsmbclient/src/telldir/telldir_2.c | 95 --- testsuite/libsmbclient/src/telldir/telldir_3.c | 67 -- testsuite/libsmbclient/src/telldir/telldir_4.c | 61 -- testsuite/libsmbclient/src/telldir/telldir_5.c | 124 --- testsuite/libsmbclient/src/unlink/unlink_1.c | 61 -- testsuite/libsmbclient/src/unlink/unlink_10.c | 62 -- testsuite/libsmbclient/src/unlink/unlink_11.c | 66 -- testsuite/libsmbclient/src/unlink/unlink_12.c | 65 -- testsuite/libsmbclient/src/unlink/unlink_2.c | 61 -- testsuite/libsmbclient/src/unlink/unlink_3.c | 57 -- testsuite/libsmbclient/src/unlink/unlink_4.c | 64 -- testsuite/libsmbclient/src/unlink/unlink_5.c | 62 -- testsuite/libsmbclient/src/unlink/unlink_6.c | 58 -- testsuite/libsmbclient/src/unlink/unlink_7.c | 62 -- testsuite/libsmbclient/src/unlink/unlink_8.c | 55 -- testsuite/libsmbclient/src/unlink/unlink_9.c | 57 -- .../src/unlink_print_job/unlink_print_job_1.c | 107 --- .../src/unlink_print_job/unlink_print_job_2.c | 102 --- .../src/unlink_print_job/unlink_print_job_3.c | 106 --- .../src/unlink_print_job/unlink_print_job_4.c | 101 --- .../src/unlink_print_job/unlink_print_job_5.c | 141 ---- testsuite/libsmbclient/src/write/write_1.c | 77 -- testsuite/libsmbclient/src/write/write_10.c | 70 -- testsuite/libsmbclient/src/write/write_11.c | 83 -- testsuite/libsmbclient/src/write/write_12.c | 83 -- testsuite/libsmbclient/src/write/write_13.c | 87 -- testsuite/libsmbclient/src/write/write_2.c | 71 -- testsuite/libsmbclient/src/write/write_3.c | 79 -- testsuite/libsmbclient/src/write/write_4.c | 74 -- testsuite/libsmbclient/src/write/write_5.c | 79 -- testsuite/libsmbclient/src/write/write_6.c | 74 -- testsuite/libsmbclient/src/write/write_7.c | 60 -- testsuite/libsmbclient/src/write/write_8.c | 56 -- testsuite/libsmbclient/src/write/write_9.c | 72 -- testsuite/libsmbclient/src/wscript_build | 39 - wintest/test-s4-howto.py | 3 +- wscript_build | 1 - 154 files changed, 17 insertions(+), 11537 deletions(-) delete mode 100644 testsuite/libsmbclient/src/Makefile delete mode 100644 testsuite/libsmbclient/src/chmod/chmod_1.c delete mode 100644 testsuite/libsmbclient/src/chown/chown_1.c delete mode 100644 testsuite/libsmbclient/src/close/close_1.c delete mode 100644 testsuite/libsmbclient/src/close/close_2.c delete mode 100644 testsuite/libsmbclient/src/closedir/closedir_1.c delete mode 100644 testsuite/libsmbclient/src/closedir/closedir_2.c delete mode 100644 testsuite/libsmbclient/src/closedir/closedir_3.c delete mode 100644 testsuite/libsmbclient/src/closedir/closedir_4.c delete mode 100644 testsuite/libsmbclient/src/creat/creat_1.c delete mode 100644 testsuite/libsmbclient/src/creat/creat_2.c delete mode 100644 testsuite/libsmbclient/src/creat/creat_3.c delete mode 100644 testsuite/libsmbclient/src/fstat/fstat_1.c delete mode 100644 testsuite/libsmbclient/src/fstat/fstat_2.c delete mode 100644 testsuite/libsmbclient/src/fstat/fstat_3.c delete mode 100644 testsuite/libsmbclient/src/fstat/fstat_4.c delete mode 100644 testsuite/libsmbclient/src/fstat/fstat_5.c delete mode 100644 testsuite/libsmbclient/src/fstat/fstat_6.c delete mode 100644 testsuite/libsmbclient/src/getdents/getdents_1.c delete mode 100644 testsuite/libsmbclient/src/getdents/getdents_2.c delete mode 100644 testsuite/libsmbclient/src/getdents/getdents_3.c delete mode 100644 testsuite/libsmbclient/src/getdents/getdents_4.c delete mode 100644 testsuite/libsmbclient/src/getdents/getdents_5.c delete mode 100644 testsuite/libsmbclient/src/init/init_1.c delete mode 100644 testsuite/libsmbclient/src/init/init_2.c delete mode 100644 testsuite/libsmbclient/src/init/init_3.c delete mode 100644 testsuite/libsmbclient/src/init/init_4.c delete mode 100644 testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_1.c delete mode 100644 testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_2.c delete mode 100644 testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_3.c delete mode 100644 testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_4.c delete mode 100644 testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_5.c delete mode 100644 testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_6.c delete mode 100644 testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_7.c delete mode 100644 testsuite/libsmbclient/src/lseek/lseek_1.c delete mode 100644 testsuite/libsmbclient/src/lseek/lseek_2.c delete mode 100644 testsuite/libsmbclient/src/lseek/lseek_3.c delete mode 100644 testsuite/libsmbclient/src/lseek/lseek_4.c delete mode 100644 testsuite/libsmbclient/src/lseek/lseek_5.c delete mode 100644 testsuite/libsmbclient/src/lseek/lseek_6.c delete mode 100644 testsuite/libsmbclient/src/lseek/lseek_7.c delete mode 100644 testsuite/libsmbclient/src/lseek/lseek_8.c delete mode 100644 testsuite/libsmbclient/src/lseekdir/lseekdir_1.c delete mode 100644 testsuite/libsmbclient/src/lseekdir/lseekdir_2.c delete mode 100644 testsuite/libsmbclient/src/lseekdir/lseekdir_3.c delete mode 100644 testsuite/libsmbclient/src/lseekdir/lseekdir_4.c delete mode 100644 testsuite/libsmbclient/src/lseekdir/lseekdir_5.c delete mode 100644 testsuite/libsmbclient/src/lseekdir/lseekdir_6.c delete mode 100644 testsuite/libsmbclient/src/mkdir/mkdir_1.c delete mode 100644 testsuite/libsmbclient/src/mkdir/mkdir_2.c delete mode 100644 testsuite/libsmbclient/src/mkdir/mkdir_3.c delete mode 100644 testsuite/libsmbclient/src/mkdir/mkdir_4.c delete mode 100644 testsuite/libsmbclient/src/open/open_1.c delete mode 100644 testsuite/libsmbclient/src/open/open_2.c delete mode 100644 testsuite/libsmbclient/src/open/open_3.c delete mode 100644 testsuite/libsmbclient/src/open/open_4.c delete mode 100644 testsuite/libsmbclient/src/open/open_5.c delete mode 100644 testsuite/libsmbclient/src/open_print_job/open_print_job_1.c delete mode 100644 testsuite/libsmbclient/src/open_print_job/open_print_job_2.c delete mode 100644 testsuite/libsmbclient/src/opendir/opendir_1.c delete mode 100644 testsuite/libsmbclient/src/opendir/opendir_2.c delete mode 100644 testsuite/libsmbclient/src/opendir/opendir_3.c delete mode 100644 testsuite/libsmbclient/src/opendir/opendir_4.c delete mode 100644 testsuite/libsmbclient/src/print_file/print_file_1.c delete mode 100644 testsuite/libsmbclient/src/print_file/print_file_2.c delete mode 100644 testsuite/libsmbclient/src/print_file/print_file_3.c delete mode 100644 testsuite/libsmbclient/src/print_file/print_file_4.c delete mode 100644 testsuite/libsmbclient/src/read/read_1.c delete mode 100644 testsuite/libsmbclient/src/read/read_10.c delete mode 100644 testsuite/libsmbclient/src/read/read_11.c delete mode 100644 testsuite/libsmbclient/src/read/read_12.c delete mode 100644 testsuite/libsmbclient/src/read/read_13.c delete mode 100644 testsuite/libsmbclient/src/read/read_2.c delete mode 100644 testsuite/libsmbclient/src/read/read_3.c delete mode 100644 testsuite/libsmbclient/src/read/read_4.c delete mode 100644 testsuite/libsmbclient/src/read/read_5.c delete mode 100644 testsuite/libsmbclient/src/read/read_6.c delete mode 100644 testsuite/libsmbclient/src/read/read_7.c delete mode 100644 testsuite/libsmbclient/src/read/read_8.c delete mode 100644 testsuite/libsmbclient/src/read/read_9.c delete mode 100644 testsuite/libsmbclient/src/readdir/readdir_1.c delete mode 100644 testsuite/libsmbclient/src/readdir/readdir_2.c delete mode 100644 testsuite/libsmbclient/src/readdir/readdir_3.c delete mode 100644 testsuite/libsmbclient/src/readdir/readdir_4.c delete mode 100644 testsuite/libsmbclient/src/readdir/readdir_5.c delete mode 100644 testsuite/libsmbclient/src/rename/rename_1.c delete mode 100644 testsuite/libsmbclient/src/rename/rename_10.c delete mode 100644 testsuite/libsmbclient/src/rename/rename_11.c delete mode 100644 testsuite/libsmbclient/src/rename/rename_12.c delete mode 100644 testsuite/libsmbclient/src/rename/rename_13.c delete mode 100644 testsuite/libsmbclient/src/rename/rename_14.c delete mode 100644 testsuite/libsmbclient/src/rename/rename_2.c delete mode 100644 testsuite/libsmbclient/src/rename/rename_3.c delete mode 100644 testsuite/libsmbclient/src/rename/rename_4.c delete mode 100644 testsuite/libsmbclient/src/rename/rename_5.c delete mode 100644 testsuite/libsmbclient/src/rename/rename_6.c delete mode 100644 testsuite/libsmbclient/src/rename/rename_7.c delete mode 100644 testsuite/libsmbclient/src/rename/rename_8.c delete mode 100644 testsuite/libsmbclient/src/rename/rename_9.c delete mode 100644 testsuite/libsmbclient/src/rmdir/rmdir_1.c delete mode 100644 testsuite/libsmbclient/src/rmdir/rmdir_2.c delete mode 100644 testsuite/libsmbclient/src/rmdir/rmdir_3.c delete mode 100644 testsuite/libsmbclient/src/rmdir/rmdir_4.c delete mode 100644 testsuite/libsmbclient/src/rmdir/rmdir_5.c delete mode 100644 testsuite/libsmbclient/src/rmdir/rmdir_6.c delete mode 100644 testsuite/libsmbclient/src/stat/stat_1.c delete mode 100644 testsuite/libsmbclient/src/stat/stat_2.c delete mode 100644 testsuite/libsmbclient/src/stat/stat_3.c delete mode 100644 testsuite/libsmbclient/src/stat/stat_4.c delete mode 100644 testsuite/libsmbclient/src/stat/stat_5.c delete mode 100644 testsuite/libsmbclient/src/stat/stat_6.c delete mode 100644 testsuite/libsmbclient/src/stat/stat_k.c delete mode 100644 testsuite/libsmbclient/src/telldir/telldir_1.c delete mode 100644 testsuite/libsmbclient/src/telldir/telldir_2.c delete mode 100644 testsuite/libsmbclient/src/telldir/telldir_3.c delete mode 100644 testsuite/libsmbclient/src/telldir/telldir_4.c delete mode 100644 testsuite/libsmbclient/src/telldir/telldir_5.c delete mode 100644 testsuite/libsmbclient/src/unlink/unlink_1.c delete mode 100644 testsuite/libsmbclient/src/unlink/unlink_10.c delete mode 100644 testsuite/libsmbclient/src/unlink/unlink_11.c delete mode 100644 testsuite/libsmbclient/src/unlink/unlink_12.c delete mode 100644 testsuite/libsmbclient/src/unlink/unlink_2.c delete mode 100644 testsuite/libsmbclient/src/unlink/unlink_3.c delete mode 100644 testsuite/libsmbclient/src/unlink/unlink_4.c delete mode 100644 testsuite/libsmbclient/src/unlink/unlink_5.c delete mode 100644 testsuite/libsmbclient/src/unlink/unlink_6.c delete mode 100644 testsuite/libsmbclient/src/unlink/unlink_7.c delete mode 100644 testsuite/libsmbclient/src/unlink/unlink_8.c delete mode 100644 testsuite/libsmbclient/src/unlink/unlink_9.c delete mode 100644 testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_1.c delete mode 100644 testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_2.c delete mode 100644 testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_3.c delete mode 100644 testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_4.c delete mode 100644 testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_5.c delete mode 100644 testsuite/libsmbclient/src/write/write_1.c delete mode 100644 testsuite/libsmbclient/src/write/write_10.c delete mode 100644 testsuite/libsmbclient/src/write/write_11.c delete mode 100644 testsuite/libsmbclient/src/write/write_12.c delete mode 100644 testsuite/libsmbclient/src/write/write_13.c delete mode 100644 testsuite/libsmbclient/src/write/write_2.c delete mode 100644 testsuite/libsmbclient/src/write/write_3.c delete mode 100644 testsuite/libsmbclient/src/write/write_4.c delete mode 100644 testsuite/libsmbclient/src/write/write_5.c delete mode 100644 testsuite/libsmbclient/src/write/write_6.c delete mode 100644 testsuite/libsmbclient/src/write/write_7.c delete mode 100644 testsuite/libsmbclient/src/write/write_8.c delete mode 100644 testsuite/libsmbclient/src/write/write_9.c delete mode 100644 testsuite/libsmbclient/src/wscript_build Changeset truncated at 500 lines: diff --git a/file_server/file_server.c b/file_server/file_server.c index c28acae..0e9d321 100644 --- a/file_server/file_server.c +++ b/file_server/file_server.c @@ -70,6 +70,11 @@ static const char *generate_smb_conf(struct task_server *task) fdprintf(fd, "vfs objects = acl_xattr\n"); } + fdprintf(fd, "map hidden = no\n"); + fdprintf(fd, "map system = no\n"); + fdprintf(fd, "map readonly = no\n"); + fdprintf(fd, "store dos attributes = yes\n"); + fdprintf(fd, "include = %s\n", lpcfg_configfile(lp_ctx)); fdprintf(fd, "[IPC$]\n"); diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index b94abdb..b52bc0e 100644 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -1289,10 +1289,6 @@ sub provision_plugin_s4_dc($$) smbd:sharedelay = 100000 smbd:writetimeupdatedelay = 500000 - map hidden = no - map system = no - map readonly = no - store dos attributes = yes create mask = 755 dos filemode = yes diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py index 04cafa9..d84a0f8 100644 --- a/source4/scripting/python/samba/provision/__init__.py +++ b/source4/scripting/python/samba/provision/__init__.py @@ -119,6 +119,7 @@ class ProvisionPaths(object): self.dns = None self.winsdb = None self.private_dir = None + self.state_dir = None self.phpldapadminconfig = None @@ -447,6 +448,7 @@ def provision_paths_from_lp(lp, dnsdomain): """ paths = ProvisionPaths() paths.private_dir = lp.get("private dir") + paths.state_dir = lp.get("state directory") # This is stored without path prefix for the "privateKeytab" attribute in # "secrets_dns.ldif". @@ -645,12 +647,12 @@ def make_smbconf(smbconf, hostname, domain, realm, targetdir, if targetdir is not None: global_settings["private dir"] = os.path.abspath(os.path.join(targetdir, "private")) global_settings["lock dir"] = os.path.abspath(targetdir) - global_settings["state directory"] = os.path.abspath(targetdir) - global_settings["cache directory"] = os.path.abspath(targetdir) + global_settings["state directory"] = os.path.abspath(os.path.join(targetdir, "state")) + global_settings["cache directory"] = os.path.abspath(os.path.join(targetdir, "cache")) lp.set("lock dir", os.path.abspath(targetdir)) - lp.set("state directory", os.path.abspath(targetdir)) - lp.set("cache directory", os.path.abspath(targetdir)) + lp.set("state directory", global_settings["state directory"]) + lp.set("cache directory", global_settings["cache directory"]) shares = {} if serverrole == "domain controller": @@ -1654,7 +1656,7 @@ def provision(logger, session_info, credentials, smbconf=None, if not use_ntvfs: server_services.append("-smb") server_services.append("+s3fs") - global_param["vfs objects"] = ["acl_xattr"] + global_param["dcerpc endpoint servers"] = ["-winreg", "-srvsvc"] if len(server_services) > 0: global_param["server services"] = server_services @@ -1724,6 +1726,8 @@ def provision(logger, session_info, credentials, smbconf=None, os.mkdir(paths.private_dir) if not os.path.exists(os.path.join(paths.private_dir, "tls")): os.mkdir(os.path.join(paths.private_dir, "tls")) + if not os.path.exists(paths.state_dir): + os.mkdir(paths.state_dir) ldapi_url = "ldapi://%s" % urllib.quote(paths.s4_ldapi_path, safe="") diff --git a/source4/setup/provision b/source4/setup/provision index a0e58ec..a9d71cd 100755 --- a/source4/setup/provision +++ b/source4/setup/provision @@ -125,7 +125,7 @@ parser.add_option("--ol-mmr-urls", type="string", metavar="LDAPSERVER", parser.add_option("--slapd-path", type="string", metavar="SLAPD-PATH", help="Path to slapd for LDAP backend [e.g.:'/usr/local/libexec/slapd']. Required for Setup with LDAP-Backend. OpenLDAP Version >= 2.4.17 should be used.") parser.add_option("--use-xattrs", type="choice", choices=["yes", "no", "auto"], help="Define if we should use the native fs capabilities or a tdb file for storing attributes likes ntacl, auto tries to make an inteligent guess based on the user rights and system capabilities", default="auto") -parser.add_option("--use-s3fs", help="Use s3fs for the fileserver (default = no)") +parser.add_option("--use-s3fs", action="store_true", help="Use s3fs for the fileserver (default = no)") opts = parser.parse_args()[0] diff --git a/testsuite/libsmbclient/src/Makefile b/testsuite/libsmbclient/src/Makefile deleted file mode 100644 index 1f640ca..0000000 --- a/testsuite/libsmbclient/src/Makefile +++ /dev/null @@ -1,854 +0,0 @@ -CC = gcc -CFLAGS = -Wall -W -O2 -g -I../../../source3/include -LFLAGS = -L../../../source3/bin - -LIBS= -L/usr/lib -lsmbclient -ltalloc -ltdb -lwbclient -INCPATH= -I. -I/usr/include -I./include -BIN_DIR=bin - -SUB_DIRS=init fstat open unlink chown close opendir closedir rename lseek lseekdir stat \ - getdents creat read readdir mkdir rmdir write chmod open_print_job list_print_jobs \ - print_file telldir unlink_print_job - -MAKEDIR = || exec false; \ - if test -d "$$dir"; then :; else \ - echo mkdir "$$dir"; \ - mkdir -p "$$dir" >/dev/null 2>&1 || \ - test -d "$$dir" || \ - mkdir "$$dir" || \ - exec false; fi || exec false - -G_INIT = $(BIN_DIR)/init_1 \ - $(BIN_DIR)/init_2 \ - $(BIN_DIR)/init_3 \ - $(BIN_DIR)/init_4 - -G_FSTAT = $(BIN_DIR)/fstat_1 \ - $(BIN_DIR)/fstat_2 \ - $(BIN_DIR)/fstat_3 \ - $(BIN_DIR)/fstat_4 \ - $(BIN_DIR)/fstat_5 \ - $(BIN_DIR)/fstat_6 - -G_OPEN = $(BIN_DIR)/open_1 \ - $(BIN_DIR)/open_2 \ - $(BIN_DIR)/open_3 \ - $(BIN_DIR)/open_4 \ - $(BIN_DIR)/open_5 - -G_UNLINK = $(BIN_DIR)/unlink_1 \ - $(BIN_DIR)/unlink_2 \ - $(BIN_DIR)/unlink_3 \ - $(BIN_DIR)/unlink_4 \ - $(BIN_DIR)/unlink_5 \ - $(BIN_DIR)/unlink_6 \ - $(BIN_DIR)/unlink_7 \ - $(BIN_DIR)/unlink_8 \ - $(BIN_DIR)/unlink_9 \ - $(BIN_DIR)/unlink_10 \ - $(BIN_DIR)/unlink_11 \ - $(BIN_DIR)/unlink_12 - - -G_CLOSE = $(BIN_DIR)/close_1 \ - $(BIN_DIR)/close_2 - -G_OPENDIR = $(BIN_DIR)/opendir_1 \ - $(BIN_DIR)/opendir_2 \ - $(BIN_DIR)/opendir_3 \ - $(BIN_DIR)/opendir_4 - -G_CLOSEDIR = $(BIN_DIR)/closedir_1 \ - $(BIN_DIR)/closedir_2 \ - $(BIN_DIR)/closedir_3 \ - $(BIN_DIR)/closedir_4 - -G_RENAME = $(BIN_DIR)/rename_1 \ - $(BIN_DIR)/rename_2 \ - $(BIN_DIR)/rename_3 \ - $(BIN_DIR)/rename_4 \ - $(BIN_DIR)/rename_5 \ - $(BIN_DIR)/rename_6 \ - $(BIN_DIR)/rename_7 \ - $(BIN_DIR)/rename_8 \ - $(BIN_DIR)/rename_9 \ - $(BIN_DIR)/rename_10 \ - $(BIN_DIR)/rename_11 \ - $(BIN_DIR)/rename_12 \ - $(BIN_DIR)/rename_13 \ - $(BIN_DIR)/rename_14 - -G_LSEEK = $(BIN_DIR)/lseek_1 \ - $(BIN_DIR)/lseek_2 \ - $(BIN_DIR)/lseek_3 \ - $(BIN_DIR)/lseek_4 \ - $(BIN_DIR)/lseek_5 \ - $(BIN_DIR)/lseek_6 \ - $(BIN_DIR)/lseek_7 \ - $(BIN_DIR)/lseek_8 - -G_LSEEKDIR = $(BIN_DIR)/lseekdir_1 \ - $(BIN_DIR)/lseekdir_2 \ - $(BIN_DIR)/lseekdir_3 \ - $(BIN_DIR)/lseekdir_4 \ - $(BIN_DIR)/lseekdir_5 \ - $(BIN_DIR)/lseekdir_6 - -G_STAT = $(BIN_DIR)/stat_1 \ - $(BIN_DIR)/stat_2 \ - $(BIN_DIR)/stat_3 \ - $(BIN_DIR)/stat_4 \ - $(BIN_DIR)/stat_5 \ - $(BIN_DIR)/stat_6 \ - $(BIN_DIR)/stat_k - -G_GETDENTS = $(BIN_DIR)/getdents_1 \ - $(BIN_DIR)/getdents_2 \ - $(BIN_DIR)/getdents_3 \ - $(BIN_DIR)/getdents_4 \ - $(BIN_DIR)/getdents_5 - -G_CREAT = $(BIN_DIR)/creat_1 \ - $(BIN_DIR)/creat_2 \ - $(BIN_DIR)/creat_3 - -G_READ = $(BIN_DIR)/read_1 \ - $(BIN_DIR)/read_2 \ - $(BIN_DIR)/read_3 \ - $(BIN_DIR)/read_4 \ - $(BIN_DIR)/read_5 \ - $(BIN_DIR)/read_6 \ - $(BIN_DIR)/read_7 \ - $(BIN_DIR)/read_8 \ - $(BIN_DIR)/read_9 \ - $(BIN_DIR)/read_10 \ - $(BIN_DIR)/read_11 \ - $(BIN_DIR)/read_12 \ - $(BIN_DIR)/read_13 - -G_MKDIR = $(BIN_DIR)/mkdir_1 \ - $(BIN_DIR)/mkdir_2 \ - $(BIN_DIR)/mkdir_3 \ - $(BIN_DIR)/mkdir_4 - -G_RMDIR = $(BIN_DIR)/rmdir_1 \ - $(BIN_DIR)/rmdir_2 \ - $(BIN_DIR)/rmdir_3 \ - $(BIN_DIR)/rmdir_4 \ - $(BIN_DIR)/rmdir_5 \ - $(BIN_DIR)/rmdir_6 - -G_READDIR = $(BIN_DIR)/readdir_1 \ - $(BIN_DIR)/readdir_2 \ - $(BIN_DIR)/readdir_3 \ - $(BIN_DIR)/readdir_4 \ - $(BIN_DIR)/readdir_5 - -G_WRITE = $(BIN_DIR)/write_1 \ - $(BIN_DIR)/write_2 \ - $(BIN_DIR)/write_3 \ - $(BIN_DIR)/write_4 \ - $(BIN_DIR)/write_5 \ - $(BIN_DIR)/write_6 \ - $(BIN_DIR)/write_7 \ - $(BIN_DIR)/write_8 \ - $(BIN_DIR)/write_9 \ - $(BIN_DIR)/write_10 \ - $(BIN_DIR)/write_11 \ - $(BIN_DIR)/write_12 \ - $(BIN_DIR)/write_13 - -G_TELLDIR = $(BIN_DIR)/telldir_1 \ - $(BIN_DIR)/telldir_2 \ - $(BIN_DIR)/telldir_3 \ - $(BIN_DIR)/telldir_4 \ - $(BIN_DIR)/telldir_5 - -G_CHMOD = $(BIN_DIR)/chmod_1 - -G_CHOWN = $(BIN_DIR)/chown_1 - -G_PRINT_FILE = $(BIN_DIR)/print_file_1 \ - $(BIN_DIR)/print_file_2 \ - $(BIN_DIR)/print_file_3 \ - $(BIN_DIR)/print_file_4 - -G_OPEN_PRINT_JOB = $(BIN_DIR)/open_print_job_1 \ - $(BIN_DIR)/open_print_job_2 - -G_LIST_PRINT_JOBS = $(BIN_DIR)/list_print_jobs_1 \ - $(BIN_DIR)/list_print_jobs_2 \ - $(BIN_DIR)/list_print_jobs_3 \ - $(BIN_DIR)/list_print_jobs_4 \ - $(BIN_DIR)/list_print_jobs_5 \ - $(BIN_DIR)/list_print_jobs_6 \ - $(BIN_DIR)/list_print_jobs_7 - -G_UNLINK_PRINT_JOB = $(BIN_DIR)/unlink_print_job_1 \ - $(BIN_DIR)/unlink_print_job_2 \ - $(BIN_DIR)/unlink_print_job_3 \ - $(BIN_DIR)/unlink_print_job_4 \ - $(BIN_DIR)/unlink_print_job_5 - -GROUPS= $(G_CHMOD) $(G_CHOWN) $(G_CLOSE) $(G_CLOSEDIR) $(G_CREAT) $(G_FSTAT)\ - $(G_GETDENTS) $(G_INIT) $(G_LIST_PRINT_JOBS) $(G_LSEEK) $(G_LSEEKDIR) \ - $(G_MKDIR) $(G_OPEN) $(G_OPENDIR) $(G_OPEN_PRINT_JOB) $(G_PRINT_FILE)\ - $(G_READ) $(G_READDIR) $(G_RENAME) $(G_RMDIR) $(G_STAT) $(G_TELLDIR) $(G_UNLINK) \ - $(G_UNLINK_PRINT_JOB) $(G_WRITE) - -.c.o: - @echo Compiling $*.c - @$(CC) -c $(CFLAGS) -o $@ $(INCPATH) $< - - -all: $(GROUPS) - -init: $(G_INIT) -fstat: $(G_FSTAT) -open: $(G_OPEN) -unlink: $(G_UNLINK) -chown: $(G_CHOWN) -close: $(G_CLOSE) -opendir: $(G_OPENDIR) -closedir: $(G_CLOSEDIR) -rename: $(G_RENAME) -readdir: $(G_READDIR) -lseek: $(G_LSEEK) -lseekdir: $(G_LSEEKDIR) -stat: $(G_STAT) -getdents: $(G_GETDENTS) -creat: $(G_CREAT) -read: $(G_READ) -mkdir: $(G_MKDIR) -rmdir: $(G_RMDIR) -write: $(G_WRITE) -chmod: $(G_CHMOD) -telldir: $(G_TELLDIR) -print_file: $(G_PRINT_FILE) -open_print_job: $(G_OPEN_PRINT_JOB) -list_print_jobs: $(G_LIST_PRINT_JOBS) -unlink_print_job: $(G_UNLINK_PRINT_JOB) - - -$(BIN_DIR)/testsmbc: testsmbc.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ testsmbc.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/init_1: init/init_1.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ init/init_1.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/init_2: init/init_2.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ init/init_2.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/init_3: init/init_3.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ init/init_3.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/init_4: init/init_4.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ init/init_4.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/fstat_1: fstat/fstat_1.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ fstat/fstat_1.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/fstat_2: fstat/fstat_2.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ fstat/fstat_2.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/fstat_3: fstat/fstat_3.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ fstat/fstat_3.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/fstat_4: fstat/fstat_4.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ fstat/fstat_4.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/fstat_5: fstat/fstat_5.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ fstat/fstat_5.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/fstat_6: fstat/fstat_6.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ fstat/fstat_6.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/open_1: open/open_1.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ open/open_1.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/open_2: open/open_2.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ open/open_2.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/open_3: open/open_3.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ open/open_3.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/open_4: open/open_4.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ open/open_4.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/open_5: open/open_5.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ open/open_5.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/unlink_1: unlink/unlink_1.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ unlink/unlink_1.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/unlink_2: unlink/unlink_2.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ unlink/unlink_2.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/unlink_3: unlink/unlink_3.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ unlink/unlink_3.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/unlink_4: unlink/unlink_4.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ unlink/unlink_4.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/unlink_5: unlink/unlink_5.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ unlink/unlink_5.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/unlink_6: unlink/unlink_6.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ unlink/unlink_6.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/unlink_7: unlink/unlink_7.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ unlink/unlink_7.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/unlink_8: unlink/unlink_8.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ unlink/unlink_8.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/unlink_9: unlink/unlink_9.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ unlink/unlink_9.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/unlink_10: unlink/unlink_10.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ unlink/unlink_10.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/unlink_11: unlink/unlink_11.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ unlink/unlink_11.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/unlink_12: unlink/unlink_12.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ unlink/unlink_12.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/chown_1: chown/chown_1.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ chown/chown_1.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/close_1: close/close_1.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ close/close_1.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/close_2: close/close_2.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ close/close_2.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/opendir_1: opendir/opendir_1.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ opendir/opendir_1.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/opendir_2: opendir/opendir_2.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ opendir/opendir_2.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/opendir_3: opendir/opendir_3.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ opendir/opendir_3.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/opendir_4: opendir/opendir_4.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ opendir/opendir_4.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/closedir_1: closedir/closedir_1.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ closedir/closedir_1.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/closedir_2: closedir/closedir_2.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ closedir/closedir_2.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/closedir_3: closedir/closedir_3.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ closedir/closedir_3.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/closedir_4: closedir/closedir_4.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ closedir/closedir_4.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/rename_1: rename/rename_1.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ rename/rename_1.o $(INCPATH) $(LIBS) - -$(BIN_DIR)/rename_2: rename/rename_2.o - @echo Linking $@ - @$(CC) $(LFLAGS) -o $@ rename/rename_2.o $(INCPATH) $(LIBS) -- Samba Shared Repository