[SCM] Samba Shared Repository - annotated tag ldb-1.1.8 created
The annotated tag, ldb-1.1.8 has been created at f70ae07402319317e0bc221cee95f3f150920bdc (tag) tagging 7b1fb36ad0df810b8629a4f5d5f069de4466d080 (commit) replaces samba-4.0.0beta3 tagged by Andrew Tridgell on Mon Jul 9 16:52:54 2012 +1000 - Log - ldb: tag release ldb-1.1.8 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQEVAwUAT/p/xkeTkWETCEAlAQIkaQgAhZfRtxph+z0w/7n+TxSguopZHg40G0G1 o2uk1HFvzIbZosJLv5s84gpyBgYDsWYOzcANCvO3bjJJln+uAUsqEZ17+/WoqbpH HVVSbvrr2TuxkrZ5oUnAQgMj+ikpittKzibMIbTs1XdRn1MAp7Dgs8gdbEFor/uT QwZPuhznZ4NkfawCo1N5rzSoFealDCnFlsdIxoEYGf0mnkfAg6JQLCQJ9ACU2cgP 9/0rLVTmjZlVOQF3Zgre4m+lF4i1FxpaoqKo5RxLeycU9dPehEJMJHygAns/gBlu Y/apvU7NfKmEAwZRSHmZpT/wBcWUea5pK8khrZNUh56kspPqxJNuwA== =w7iw -END PGP SIGNATURE- Amitay Isaacs (12): samba-tool: gpo: Fix policy DN samba-tool: gpo: Correct the attribute name from gPlink to gPLink samba-tool: gpo: Use gpo (id) instead of gpo_dn (DN) samba-tool: Fix indentation s4-pysmb: Add deltree() method to remove directory and its contents samba-tool: gpo: Add utility functions get_gpo_containers and del_gpo_link samba-tool: gpo: Refactor code using utility functions samba-tool: gpo: Use utility function dc_url() to set the connection url samba-tool: gpo: Add listcontainers subcommand to list containers using given GPO samba-tool: gpo: Add del subcommand to delete GPO samba-tool: gpo: Improve error messages samba-tool: gpo: Update copyright Andreas Schneider (40): s3-winbind: Remove obsolte idmap_adex. doc: Remove documentation about idmap_adex. s3-printing: Remove deprecated lp_printer_admin(). doc: Remove all references to 'printer admin' option. s3-passdb: Remove obsolte ldapsam_compat support. doc: Remove documentation for obsolete ldapsam_compat. s3-smbd: Remove deprecated 'share modes' option. doc: Remove references to deprecated 'share modes' parameter. s4-torture: Fix build warnings in lsa test. s4-torture: Use test_LookupSids3 function. s4-torture: Test LookupSids3 and LookupNames4 only over tcpip. s4-torture: Make sure ncacn_np tests are only called over the a pipe. s4-torture: Make sure lsa_OpenPolicy fails over TCP/IP. s4-torture: Make sure lsa_OpenPolicy2 fails over TCP/IP. s4-torture: Test LookupSids3/LookupNames4 over np and tcpip. s3-selftest: Run lsa tests over np and tcpip. s3-rpc_server: Make it possible to use more rpc exceptions. s3-rpc: Return the correct ntstatus depending on the transport. s3-lsarpc: Restrict the transport for ncacn_np functions. s3-lsarpc: Restrict lsa_LookupSids3 to ncacn_ip_tcp connections. s3-lsarpc: Restrict lsa_LookupNames4 to ncacn_ip_tcp connections. s3-lsarpc: Enforce a secure connection for LookupSids3 and LookupNames4. s4-torture: Add a lsarpc test_LookupSids3_fail function. s4-torture: Add a lsarpc test_LookupNames4_fail function. s4-torture: Add a lsarpc test_OpenPolicy_fail function. s4-torture: Add a lsarpc test_OpenPolicy2_fail function. s4-torture: Add a lsarpc test_GetUserName_fail function. s4-torture: Don't consider NONE_MAPPED an error in LookupNames4. s4-torture: Don't consider NONE_MAPPED an error in LookupSids3. s4-torture: Call lsarpc tests over the correct pipe. s4-libnet: Skip calling lsarpc functions over a wrong pipe. s4-selftest: Don't plan lsa.secrets tests over tcpip. s4-selftest: Don't run lsarpc requiring a named pipe over tcpip. selftest: Update knownfail list for samba4.rpc.lsalookup. s4-lsaprc: Don't call lsa_OpenPolicy2 in lsa_LookupNames4. s4-lsarpc: Don't call lsa_OpenPolicy2 in lsa_LookupSids3. s4-lsarpc: Restrict LookupNames4 to crypto connections only. s4-lsarpc: Restrict LookupSids3 to crypto connections only. s4-lsarpc: DCERPC_FAULT_ACCESS_DENIED for np s4-lsarpc: DCERPC_FAULT_ACCESS_DENIED for tcp Andrew Bartlett (18): VERSION: Move on to beta4! build: Run distcheck in the correct directory WHATSNEW: Spell out version, avoid samba4 except to refer to the past ldb: bump version due to header and internal implementation changes s4-dsdb: Use parent_object_guid to find the correct parent for new objects s4-dsdb: Give a much better error message when parentGUID generation fails s4-samba-tool: Provide a samba-tool domain dcpromo that upgrades a member to a DC s4-selftest: Test samba-tool domain dcpromo s4-classicupgrade: Demote any other 'BDC' accounts back to a member server during upgrade pyldb: Fix dn concat operation to be the other way around s4-pydsdb: Improve PyErr_LDB_{DN,}_OR_RAISE to use py_check_dcerpc_type s4-pydsdb: Add bindings for dsdb_find_nc_root() pyldb: Add
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 3aa186f Simplify the logic in open_file() some more. via 3a705e5 Simplify the logic in open_file(). via 1144b0d Use new common function. via 9d5e026 Make check_same_stat() and check_same_dev_ino() common functions. via 1f37ed7 Factor out check_same_dev_ino() from check_same_stat() so it can be called separately. from 7b1fb36 lib/ldb: Bump ldb release due to pyldb changes http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 3aa186f1d4d9ca723fb9c876d0b3fc1f58d556fb Author: Jeremy Allison j...@samba.org Date: Mon Jul 9 16:13:06 2012 -0700 Simplify the logic in open_file() some more. Move the inheritance work into the if block where we created the file. We can never have created the file (and thus need no inheritance) for a stat-open. Autobuild-User(master): Jeremy Allison j...@samba.org Autobuild-Date(master): Tue Jul 10 03:30:22 CEST 2012 on sn-devel-104 commit 3a705e5f3d0843e3765852e26661aeee5ebdfd79 Author: Jeremy Allison j...@samba.org Date: Mon Jul 9 16:08:01 2012 -0700 Simplify the logic in open_file(). Move the fstat call into the block which opens a file descriptor. Remove the stat() call in the stat-open case. We already failed the open if !file_existed. commit 1144b0dc043c42e4845316a4ccc3bdd49bfda822 Author: Jeremy Allison j...@samba.org Date: Mon Jul 9 12:28:48 2012 -0700 Use new common function. commit 9d5e026bde837ed853478a223e2823fd35c67d26 Author: Jeremy Allison j...@samba.org Date: Mon Jul 9 12:26:56 2012 -0700 Make check_same_stat() and check_same_dev_ino() common functions. commit 1f37ed7a5283ef3abd095d6a92efa231e7e2444d Author: Jeremy Allison j...@samba.org Date: Mon Jul 9 11:35:20 2012 -0700 Factor out check_same_dev_ino() from check_same_stat() so it can be called separately. --- Summary of changes: source3/include/proto.h |4 ++ source3/lib/util.c | 29 ++ source3/param/loadparm.c |2 +- source3/smbd/open.c | 133 +- source3/smbd/proto.h |2 - 5 files changed, 83 insertions(+), 87 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/proto.h b/source3/include/proto.h index b7f2852..7625983 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -400,6 +400,10 @@ bool file_exist_stat(const char *fname,SMB_STRUCT_STAT *sbuf, bool fake_dir_create_times); bool socket_exist(const char *fname); uint64_t get_file_size_stat(const SMB_STRUCT_STAT *sbuf); +bool check_same_dev_ino(const SMB_STRUCT_STAT *sbuf1, + const SMB_STRUCT_STAT *sbuf2); +bool check_same_stat(const SMB_STRUCT_STAT *sbuf1, + const SMB_STRUCT_STAT *sbuf2); void show_msg(const char *buf); int set_message_bcc(char *buf,int num_bytes); ssize_t message_push_blob(uint8 **outbuf, DATA_BLOB blob); diff --git a/source3/lib/util.c b/source3/lib/util.c index 697f7b1..fa46448 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -126,6 +126,35 @@ uint64_t get_file_size_stat(const SMB_STRUCT_STAT *sbuf) return sbuf-st_ex_size; } +/ + Check two stats have identical dev and ino fields. +/ + +bool check_same_dev_ino(const SMB_STRUCT_STAT *sbuf1, +const SMB_STRUCT_STAT *sbuf2) +{ + if (sbuf1-st_ex_dev != sbuf2-st_ex_dev || + sbuf1-st_ex_ino != sbuf2-st_ex_ino) { + return false; + } + return true; +} + +/ + Check if a stat struct is identical for use. +/ + +bool check_same_stat(const SMB_STRUCT_STAT *sbuf1, + const SMB_STRUCT_STAT *sbuf2) +{ + if (sbuf1-st_ex_uid != sbuf2-st_ex_uid || + sbuf1-st_ex_gid != sbuf2-st_ex_gid || + !check_same_dev_ino(sbuf1, sbuf2)) { + return false; + } + return true; +} + /*** Show a smb message structure. / diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 12ba2f1..f8e7ace 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -8304,7 +8304,7 @@ static int process_usershare_file(const char *dir_name, const char *file_name, i } /* Is it the same dev/inode as was lstated ? */ - if (lsbuf.st_ex_dev !=