[SCM] Samba Shared Repository - branch v3-6-stable updated
Karolin Seeger
kseeger at samba.org
Mon Jun 25 11:43:09 MDT 2012
The branch, v3-6-stable has been updated
via 71e1aa5 WHATSNEW: Break line properly.
via 10f93da WHATSNEW: Add more changes since 3.6.5.
via 2ec0c77 s3:smbd: use fsp_persistent_id() as persistent_file_id part for SMB2 (bug #8995)
via e64b209 s3:smbd: add a fsp_persistent_id() function
via ea4d72c s3:smbd: try to make fsp->fh->gen_id as globally unique as possible
via 304a0ed Revert "s3:smbd: set req->smb2req->compat_chain_fsp in file_fsp()"
via 3f317ac s3:smb2_ioctl: make use of file_fsp_smb2()
via d659171 s3:smb2_lock: make use of file_fsp_smb2()
via 6fc242e s3:smb2_write: make use of file_fsp_smb2()
via 6852bfe s3:smb2_read: make use of file_fsp_smb2()
via 2587429 s3:smb2_notify: make use of file_fsp_smb2()
via 3e02120 3:smb2_setinfo: make use of file_fsp_smb2()
via 7c64c25 s3:smb2_getinfo: make use of file_fsp_smb2()
via ce994bd s3:smb2_find: make use of file_fsp_smb2()
via 6a1e1cd s3:smb2_break: make use of file_fsp_smb2()
via 3ad2be8 s3:smb2_close: make use of file_fsp_smb2()
via 9b62e13 s3:smb2_flush: make use of file_fsp_smb2()
via 30f6839 s3:smbd: add file_fsp_smb2()
via f1cc405 s3:smb2_write: pass fsp->fnum to init_strict_lock_struct()
via bf661a9 s3:smb2_read: pass fsp->fnum to init_strict_lock_struct()
via 1db059c s3:smb2_lock: use fsp->fnum as locking context
via 300dde0 s3:smb2_lock: use smb2req->compat_chain_fsp instead of looking it up again
via 8d2fba9 s3:smbd: set req->smb2req->compat_chain_fsp in file_fsp()
via 3236409 Part 2 of fix for bug #8998 - Notify code can miss a ChDir.
via 3d76007 Part 1 of fix for bug #8998 - Notify code can miss a ChDir.
via 03f7e1e Fix bug #8922.
via a7e42b4 Complete fix for bug #8811 - sd_has_inheritable_components segfaults on an SD that se_access_check accepts. (cherry picked from commit e5e86688bdcb91817954fb23ecf10a3b6ddd3933)
via e93d214 s3: remove dependency on automake for "make everything"
via a4979cf Fix bug #8972 - Directory group write permission bit is set if unix extensions are enabled
via 48c601c s3-winbindd: call dump_core_setup after command line option has been parsed
via 1985c53 Fix bug #8311 - Winzip occasionally can not read files out of an open winzip dialog.
via af02273 s3-librpc-crypto: avoid crash with MIT krb5 1.10.0 in gss_get_name_attribute()
via 437274c We are triggering the cleanup_timeout_fn() too often, on exiting when an smbd is idle.
via 7d6d5cc Stop spamming the logs with "Could not remove pid XX from serverid.tdb" messages and initiating the cleanup function on every process deat
via 7f42c03 s3: Fix uninitialized memory read in talloc_free()
via ba354be Forward port of Richard Sharpe's <realrichardsharpe at gmail.com> fix for bug #8970 - Possible memory leaks in the samba master process. (cherry picked from commit ec7a5f2593b67797fc3924611d3b0b05b807d0bf)
via 3c3c878 s3: fix compile of krb5 locator on Solaris
via c7f0c08 s3-pid: Catch with pid filename's change when config file is not smb.conf
via 35f39d7 Fix bug #8627: Crash bug in dns_create_probe.
via e360b95 Second part of fix for bug 8953 - winbind can hang as nbt_getdc() has no timeout.
via d2a03ca Fix bug #8953 - winbind can hang as nbt_getdc() has no timeout.
via 3fcc3d0 Fix bug #8373 - Can't join XP Pro workstations to 3.6.1 DC.
via 32fe035 Fix bad bugfix for bug #8910 - resolve_ads() code can return zero addresses and miss valid DC IP addresses
via 12443f2 Fix bug #8882 - Broken processing of %U with vfs_full_audit when force user is set.
via 6890468 s3-utils: Use ads_do_search_retry in net ads search
via 5093c24 s3-libads: Use a reducing page size to try and cope with a slow LDAP server
via 94d1daa s3-winbindd: Always map the LDAP error code to an NTSTATUS
via 625b834 s3-libads: Map LDAP_TIMELIMIT_EXCEEDED as NT_STATUS_IO_TIMEOUT
via 7bc591a Fix the loop unrolling inside resolve_ads(). If we don't get an IP list don't use interpret_string_addr(), as this only returns one address, use interpret_string_addr_internal() instead.
via b160634 Protect all of the name resolution methods from returning null addrs. Ensure all returns go through remove_duplicate_addrs2(). (cherry picked from commit 11973608186926e5417ee81c8709ea5b0a7ef2e1) (cherry picked from commit 495f12d932a2ec2848a17917e6f1aa39590dc97d)
via ef5541d Fix convert_ss2service() to filter out zero addresses. (cherry picked from commit d259cd40204108d262b6b3c18d1f2a9f9d0fee42)
via 1f5fc8d Fix remove_duplicate_addrs2 to do exactly what it says. Previously it could leave zero addresses in the list. (cherry picked from commit 01e884675e3d1cffb0149108225fbd21c3a73f4e) (cherry picked from commit d7bddfe22aca1663554757e9245232718adec92d)
via d288de3 Fix bug #8957 - Typo in pam_winbindd code MUST fix. (cherry picked from commit ee4ef9a535a2d9db11bd94987fb96ae8f8771e79)
via c4fd9ff s3-passdb: Fix negative SID->uid/gid cache handling. (bug #8952)
via e49e3d8 s3-auth: Don't lookup the system user in pdb.
via 524cf83 Check the return from create_acl_blob
via 28e9488 Fix the overwriting of errno before use in a DEBUG statement and use the return value from store_acl_blob_fsp rather than ignoring it.
via ccb2112 WHATSNEW: Start release notes for 3.6.6.
via 57e929f s3-printing: Add new printers to registry.
via 338acad s3:auth/server_info: the primary rid should be in the groups rid array (bug #8798)
via 845b68d s3:registry: return error when Key does not exist in regdb_fetch_values_internal() (cherry picked from commit 8a723ddfc1645e52830fb5f47a34f032f9c38931) (cherry picked from commit 32cf92f2388c0fc26e24c3174fab43089bffba03)
via 010f445 s3:registry: replace call to reg_openkey() in reg_createkey() by accesscheck. (cherry picked from commit c1cc15c33be8926ffef173b514d0fb260292d9a3) (cherry picked from commit 2b29bfcf593aa8a80e1e4cab1d344f5a70036c6e)
via b9c45a3 s3:registry: remove a superfluous fill_subkey_cache() in reg_createkey()
via 71f9cf7 s3:registry: use fill_subkey_cache to check exsistence in regkey_open_onelevel().
via 88fa527 s3:registry: let fill_subkey_cache return WERR_BADFILE when the subkey list could not be loaded
via 54cd4ef s3:registry: convert reg_openkey() to use talloc instead of SMB_STRDUP etc (cherry picked from commit 42dd99d85ca04c10691f78d6340c6b702ade974b) (cherry picked from commit 086c1e96b412688691639e89eb6cb947710eedb0)
via 8b425ce s3:registry untangle an assignment from the check in regkey_open_onelevel() (cherry picked from commit 12b7b4f0a7d8607dc206c32a3822d5678c14d43b) (cherry picked from commit 7a36a22f00d8b5024df04932eb60ec9ffa5c2932)
via 2e698d9 s3:registry: untangle assignment from check in regkey_open_onelevel() (cherry picked from commit 52d3c5c14898b5f2514d1512289370eb6f6fd369) (cherry picked from commit e4fc313293c35dda0ff35392dbcdccbfda0e1d24)
via 3255564 s3:registry: fix seqnum race in regdb_fetch_keys_internal
via 4c23d38 s3:registry avoid pruning the sequencenumber while flushing the regsubkey_ctr
via 38cf6c6 s3:registry: fix seqnum race in fetch_values_internal
via 3a42d56 s3:registry: update the seqnum in the subkey cache at the end of regval_store_keys
via ca56054 s3:registry:db: update the value container seqnum after storing/deleting to prevent next read from going to disk if possible
via 8e2a2dd s3:registry: wrap reg_deletekey() into a transaction
via db9a3fe s3:registry: wrap reg_createkey() in a transaction
via 88cdd9c s3:registry: untangle assignments from checks in reg_createkey() (cherry picked from commit 4ac9625fe42ded0717aafdf6eec4c1b2217c3c68) (cherry picked from commit 95ba1aa132e6097a0d35cbc05296427aebdf21b1)
via a7e730d s3:registry: wrap reg_deletevalue() in a transaction
via 39461d2 s3:registry: untangle assignment from check in reg_deletevalue() (cherry picked from commit 585746338bda22ff8337d41c8cc50533c5facf56) (cherry picked from commit 866faf77f92c17e7dbb21686601c7e45a3f406cd)
via de325a9 s3:registry: fix race in reg_setvalue that could lead to data corruption
via 0e83885 s3:registry: untangle assignment from check and add a debugmessage in reg_setvalue() (cherry picked from commit a81d399456eb86ffb60bed8704cd8c7864b742db) (cherry picked from commit a5025e27890a96b11d8d2119ca72a27b929aa2bc)
via f556688 s3:registry: don't leak the old contents when updating the value cache (cherry picked from commit 0bf44361caace3a4974dafa305033fb926d0f6d6) (cherry picked from commit 488b94637952de1cc6251f2d4267ee361b041a0e)
via 5d8ed8b s3:registry: fix debug message in regdb_store_values_internal() (cherry picked from commit c46403f74116708f2f8b1d531f5881bb9d7f2a84) (cherry picked from commit b6aaf6b043699cd2d518100ac2934190e3d51639)
via ac02f65 s3:registry: improve log message in regdb_unpack_values() (cherry picked from commit ae441d97cdbe8e35cd342ba979bacc3757c06cb7) (cherry picked from commit bdbfde84e2b722cc8697228d8abdb0663f4addd7)
via cafa92f s3:registry: fix a debug message typo (cherry picked from commit 9f82e1175f28bdc1c09e7bd795699b29049a77e3) (cherry picked from commit 6413d234911ab9211cf05b89412162d864b89c0a)
via f3b210e s3:registry: add a new function regval_ctr_value_byname()
via 490b779 s3:registry: rename regval_ctr_key_exists() to regval_ctr_value_exists() (cherry picked from commit 60cdf3c8b5bbda9434f0d8a05fc581ab41b42d5c) (cherry picked from commit b712448006fe5d31d9c8db164ffd7b0f0ee1191f)
via 9a7dc35 s4:torture:rpc:spoolss: also initialize driverName before checking it in test_PrinterData_DsSpooler() (cherry picked from commit 46428f96a4089925355b4eeebebb8d7f27e2ec0b) (cherry picked from commit 4cfbe636d4398e4486a6e402a86e53b77f4aaaf9)
via 30e10fc s3:registry:reg_api: fix reg_queryvalue to not fail when values are modified while it runs (cherry picked from commit 5d26120b5ab180212d570dd256e8989e0c80224d) (cherry picked from commit b356e42c0828049af8b8f3b5b977aee89c086db6)
via 578b123 s3:registry: implement values_need_update and subkeys_need_update in the smbconf backend
via 7e0c5d1 Fix bug 8920, null dereference
via 18db653 s3-pam_winbind: Fix the build.
via a63a607 Fix pam_winbind build against newer iniparser library.
via cca7741 s3-docs: Fix bug #7930.
via 594f521 s3-VFS: Fix building out-of-tree modules.
via b82584a s3-docs: Fix several typos.
via 15bc089 s3-docs: overrided -> overridden
via c756bf8 s3/ldap: remove outdated netscape ds 5 schema file
via 25178c0 Fix bug #8877 - Syslog broken owing to mistyping of debug_settings.syslog.
via 4964550 Bugfix for #8857 - Setting traverse rights fails to enable directory traversal when acl_xattr in use.
via 51c5ab6 Fix incorrect debug - parent_name is never set ! (cherry picked from commit bed05b8d6b10c77a98a73318ba483bafcccb8a34)
via 902ed7a Fix bug #8831 - Inconsistent (with manpage) command-line switch for "help" in smbtree
via b7403b2 Wrong assertion/comparison: Compare value not pointer
via 940b016 Fix bug #8897 - winbind_krb5_locator only returns one IP address.
via 46fa65c Final back port of fix for bug #8837 - smbd crashes when deleting directory and veto files are enabled.
via 69263d7 Convert parse_delete_tokens_list() and unparse_share_modes() to use ndr encoding for the struct security_unix_token. We can do this as libsmb_share_modes never looks inside the delete tokens list, only implicitly gets the length. (cherry picked from commit 5b5351022fb81da09d28ab3e7c8c2e2a8956c45e)
via 369da3f The delete tokens are unique to each name hash representing a pathname, if we don't correctly return here we'll add duplicate tokens for a given pasname hash. (cherry picked from commit a66a725f6190fe48b6c83dc7f0e65bac6fa4bbac)
via 43945e6 Fix the talloc heirarchy when adding the unix delete token. (cherry picked from commit e691385e25804c744fc820fdd6e039c3cf6b6128)
via de8fdbe Third part of fix for bug #8837 - smbd crashes when deleting directory and veto files are enabled.
via e1a24a2b First part of fix for bug 8837 - smbd crashes when deleting directory and veto files are enabled.
via d256e5c s3: Fix bug 8904 -- wbinfo --lookup-sids "" crashes winbind
via 83da2ba s3: Fix a segfault with debug level 3 on Solaris
via fd37883 s3-docs: Prepend '/' to filename argument (Bug #8826) (cherry picked from commit 6804e46811dd13cfd405f7c48a3dc2bc6501d75c) (cherry picked from commit e538c0b1f99853e2921c48db28ef32d33f4fd50d)
via 8b60e98 s3-smbd: move print_backend_init() behind init_system_info()
via 20774b0 docs: remove whitespace in example samba.ldif (fix bug #8789) (cherry picked from commit 9a68a98e87e5597ba684bea3d5e6a44951e51973) (cherry picked from commit 6edb03ed1678c4301c559e2f67c131450d3a8cfa)
via dccc0d5 s3-aio-fork: Fix a segfault in vfs_aio_fork
via bddc1ad s3-aio-fork: Fix aio_suspend event hierarchy
via 93338ad docs-xml: fix default name resolve order (fix bug #7564)
via 41deac3 s3-winbindd Only use SamLogonEx when we can get unencrypted session keys
via c26a263 Fix bug #8797 - Samba does not correctly handle DENY ACEs when privileges apply. Signed-off-by: Jeremy Allison <jra at samba.org> (cherry picked from commit 9aafc490db58017133bbd7a7f49264ee0d48f0ff) (cherry picked from commit 28150366a958a3133dc8e418695b914f2ff3f472)
via 6cb64ad v3-6-test: Further fix for bug 8338
via 5d108fc Fix bug #8807 - dcerpc_lsa_lookup_sids_noalloc() crashes when groups has more than 1000 groups
via 6c0b29e Revert "s3: Add sys_statvfs() wrapper support for OpenBSD/FreeBSD/DragonFly."
via e08c895 Fix problem reported by Tom Lee <tlee2951 at gmail.com> - when calculating the share security mask, take priviliges into account for the connecting user.
via 618f2bd s3-winbindd: set the can_do_validation6 also for trusted domain
via fd6223b s3: Add sys_statvfs() wrapper support for OpenBSD/FreeBSD/DragonFly.
via 020f89f s3-winbindd: Close netlogon connection if the status returned by the NetrSamLogonEx call is timeout in the pam_auth_crap path
via f719907 Honor SeTakeOwnershiPrivilege when client asks for SEC_STD_WRITE_OWNER but has no permission for that, but token has SeTakeOwnershipPrivilege
via d6e18a6 s3: Fix bug 8567 -- segfault in dom_sid_compare
via b45f5f2 s3: Add SERVERID_UNIQUE_ID_NOT_TO_VERIFY, bug 8760
via 050cfe9 s3-printing: fix crash in printer_list_set_printer()
via 1949e5a s3:dbwrap_ctdb: return the number of records in db_ctdb_traverse() for persistent dbs
via 66a94f2 s3-dbwrap_ctdb: fix the build.
via 971316f s3:dbwrap: traverse records created within this transaction.
via 96815de s3:dbwrap: change the dbwrap_traverse() wrapper to return the count in an additional parameter (similar to commit 8f098a635f713652c4846d71e24c0a199c25b8b7)
via c5d775c Allow vfs_aio_pthread to build as a static module.
via 14245b6 Update man page to fix typo vfs_aio_fork -> vfs_aio_pthread, add aio read size, aio write size examples. (cherry picked from commit 12b614a9298974ba5daee7aa8d1aa47006de01e2) (cherry picked from commit c738f0ea9e1c2356eab1dac778ceb94f22036f0a)
via 4b09ddf Add vfs_aio_pthread code. (cherry picked from commit 0ba64e6bc78404b2f75af638c22b52007159d96b)
via 9f767f7 Ensure we always free aio_ex on all error paths by moving the TALLOC_FREE call out of smbd_aio_complete_aio_ex() and into the caller. (cherry picked from commit caa7ccae10f9be77cf28890aadff735ca83de93e)
via 82cef7a Add man page for vfs_aio_pthread module. (cherry picked from commit d8c699190d2cc0ce64395c7b2b10bb25c98a2943) (cherry picked from commit 00d59a043dc4008f25cdf44dc233d181114dfa2d)
via 3503b39 Change the signature of pthreadpool_finished_job() to return 0 on success, errno on fail and return the jobid in a separate variable.
via 7e2fa69 s3:smb2_server: fix a logic error, we should sign non guest sessions
via a2cb122 s3:smb2-server: session setup replies should always be signed (except for guest sessions)
via c5ab915 s3-popt: Fix configure.developer builds on Solaris.
via ee4f552 s3:winbindd fix a return code check
via ab97143 s3: Add rmdir operation to streams_depot
via 03943da s3: Delete streams on directories (cherry picked from commit 9ba7748b5f1c08dbefbb8d9c9646f631c2a355e0)
via 9d85b17 s3:smbd:smb2: fix an assignment-instead-of-check bug conn_snum_used()
via 06e90f0 Fix bug #8729 - getpass regressions on Solaris/Illumos - 3.6 and master.
via 205c49e s3:auth: fill the sids array of the info3 in wbcAuthUserInfo_to_netr_SamInfo3() (bug #8739)
via bb6b11e s3:auth: fix potential gap creation in wbcsids_to_samr_RidWithAttributeArray()
via 686ad71 s3:client: ignore SMBecho errors (the server may not support it) (bug #8139) Signed-off-by: Jeremy Allison <jra at samba.org> (cherry picked from commit bb28a9387d3c76f6f8c7f79ec61d37a499d6c8f6)
via 10a4287 s3-winbind: don't try to do clever thing if the username is not found while authenticating through winbind
via c3fab3d Fix for bug #8727 - smbclient fails with posix large reads.
from 8ad95d0 WHATSNEW: Start release notes for 3.6.6.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-stable
- Log -----------------------------------------------------------------
commit 71e1aa5279977453f08cd59158eb797fcdf51de0
Author: Karolin Seeger <kseeger at samba.org>
Date: Sun Jun 24 19:19:19 2012 +0200
WHATSNEW: Break line properly.
Karolin
(cherry picked from commit dd4a51406cc5789e984aab4861e9276448fccf60)
commit 10f93dad13004757a9d2f24a7b38c0d42bd55ce3
Author: Karolin Seeger <kseeger at samba.org>
Date: Sat Jun 23 21:58:06 2012 +0200
WHATSNEW: Add more changes since 3.6.5.
Karolin
(cherry picked from commit 1efdc5fb619c8740bc5d17fb73e22f7db5d07ac8)
commit 2ec0c773c5388c8d9bf462e6ed3ca1ff75586cbd
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Jun 13 12:13:01 2012 +0200
s3:smbd: use fsp_persistent_id() as persistent_file_id part for SMB2 (bug #8995)
It seems to be important to have unique persistent file ids,
because windows clients seem to index files by server_guid + persistent_file_id.
Which may break, if we just have a 16-bit range per connection
and the client connects multiple times.
Based on code from Ira Cooper. Use fsp->fh->gen_id as the persistent
fileid in SMB2.
metze
Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
Autobuild-Date(master): Thu Jun 14 22:04:13 CEST 2012 on sn-devel-104
Signed-off-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit fc42ea02c7af66ddf5af61d444fdfe5e348d05e2)
commit e64b2099bde8308692bcd913a944f9a509d9a158
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Jun 14 10:32:43 2012 +0200
s3:smbd: add a fsp_persistent_id() function
This calculates a 64-bit value that most likely uniquely identifies
the files_struct globally to the server.
* 32-bit random gen_id
* 16-bit truncated open_time
* 16-bit fnum (valatile_id)
Based on code from Ira Cooper. Use fsp->fh->gen_id as the persistent
fileid in SMB2.
Pair-Programmed-With: Michael Adam <obnox at samba.org>
metze
Signed-off-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit cb5a0b1bc311667818ab45bb1837dc67a241a379)
commit ea4d72c678c1aaaa7b9318a517da857a35ce58fa
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Jun 13 12:11:51 2012 +0200
s3:smbd: try to make fsp->fh->gen_id as globally unique as possible
This makes sure the value is never 0, it's between 1 and UINT32_MAX.
While fsp->fh->gen_id is 'unsigned long' currently (which might by 8 bytes),
there's some oplock code which truncates it to uint32_t (using IVAL()).
Which means we could reuse fsp->fh->gen_id as persistent file id
until we have a final fix, which uses database.
See bug #8995 for more details.
Based on code from Ira Cooper. Ensure fsp->fh->gen_id starts from
a random point. We will use this as the SMB2 persistent_id.
metze
Signed-off-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 8c1159461a0c5a948cd04cdf969e54e1fa83387e)
commit 304a0ed45f4d06deb4bfce4296c2a42dfaf98a77
Author: Stefan Metzmacher <metze at samba.org>
Date: Sat Jun 9 11:11:26 2012 +0200
Revert "s3:smbd: set req->smb2req->compat_chain_fsp in file_fsp()"
This reverts commit c2716a7d5ccf78f9716b703c22e6cf4d4f179656.
This is not needed anymore, as we have file_fsp_smb2() now.
metze
Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
Autobuild-Date(master): Sun Jun 10 18:04:21 CEST 2012 on sn-devel-104
Signed-off-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit a41122337cb72fdc3f16d77396a3e68bf53c1c03)
commit 3f317acc3543ac314e1fe9a83e5fc253c147d48f
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jun 15 13:42:27 2012 -0700
s3:smb2_ioctl: make use of file_fsp_smb2()
metze
Signed-off-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 99807792d743b7f258f0d433689b6231b260bddf)
commit d659171afbe32785411ffb26b254589a330b7362
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jun 8 11:57:21 2012 +0200
s3:smb2_lock: make use of file_fsp_smb2()
metze
Signed-off-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit f3049c6cafc252a19db84636765674300ff4162b)
commit 6fc242e710d38ba5454e5c57cc1e040afaec0139
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jun 15 13:31:59 2012 -0700
s3:smb2_write: make use of file_fsp_smb2()
metze
Signed-off-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit b7da435b7ca4e15265442674c876afa9f53c9d51)
commit 6852bfee46e924cc41779dd5d620610d58cc0156
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jun 15 13:29:24 2012 -0700
s3:smb2_read: make use of file_fsp_smb2()
metze
Signed-off-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 770ea1c18f35c169ce4267f335a7ecca0cda3f40)
commit 2587429dc7e116b0b2dd66980e2b248786732d4e
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jun 15 13:27:55 2012 -0700
s3:smb2_notify: make use of file_fsp_smb2()
metze
Signed-off-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 742dd9dd2bb176bfe08ceac932ef68f1c182ffe9)
commit 3e02120eaa52625c7b6a1ef0d161601189e50b13
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jun 15 13:25:11 2012 -0700
3:smb2_setinfo: make use of file_fsp_smb2()
metze
Signed-off-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit d4b4cc33e04fe29dc98603db11173b5ca04b33d7)
commit 7c64c25e1340d7e75d3433b20bfd5911e684d3a1
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jun 15 13:23:47 2012 -0700
s3:smb2_getinfo: make use of file_fsp_smb2()
metze
Signed-off-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit e49840fc8b78d8e08ce7e662d0f760d2ee6efff0)
commit ce994bdc186cb488d18ffa505ebd142942ebf026
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jun 8 10:42:43 2012 +0200
s3:smb2_find: make use of file_fsp_smb2()
metze
Signed-off-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 45d61598c626c7e7099361e6a02e2aa3eade5d08)
commit 6a1e1cd18a2e545f05f6d18d2eea4711d6872e71
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jun 8 10:36:24 2012 +0200
s3:smb2_break: make use of file_fsp_smb2()
metze
Signed-off-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 416bb94b7b6b393eef89b4cdf5d2050ed80383e5)
commit 3ad2be8531eca336e292d5555a40d8f7fb0de354
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jun 15 13:15:27 2012 -0700
s3:smb2_close: make use of file_fsp_smb2()
metze
Signed-off-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit feed8c0ea1523b2267aa1b30fbcb009333f21b3e)
commit 9b62e13b7a3c4bbebf1fcb2a7b856e72323273cf
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jun 15 12:55:52 2012 -0700
s3:smb2_flush: make use of file_fsp_smb2()
metze
Signed-off-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 3ade9604f92dc48d2ac12ff14b4ee0504e3fdf4a)
commit 30f6839fe9e0107b2c1a19a59813b1474899efb3
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jun 8 10:11:57 2012 +0200
s3:smbd: add file_fsp_smb2()
metze
Signed-off-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 6334f807d21a54d8da0f3f9531b3f49e921e072d)
commit f1cc4054ddd5528110fb7eaa6d028a53df161740
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jun 8 11:19:00 2012 +0200
s3:smb2_write: pass fsp->fnum to init_strict_lock_struct()
fsp->fnum is the same as in_file_id_volatile.
When we start to support durable handles we should pass
in_file_id_persistent.
metze
Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
Autobuild-Date(master): Sat Jun 9 18:50:32 CEST 2012 on sn-devel-104
Signed-off-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 46d293d03a895d82bfbf2b6b0c6af797acc39d0e)
commit bf661a91dc1549ccef9e61c777aea0d0f8d6fe89
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jun 8 11:19:00 2012 +0200
s3:smb2_read: pass fsp->fnum to init_strict_lock_struct()
fsp->fnum is the same as in_file_id_volatile.
When we start to support durable handles we should pass
in_file_id_persistent.
metze
Signed-off-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 0afc9592774b0084a0c5d3191e91570f124447fa)
commit 1db059cd350a0776e56c93e8b76518174a6a1005
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jun 8 11:19:00 2012 +0200
s3:smb2_lock: use fsp->fnum as locking context
fsp->fnum is the same as in_file_id_volatile.
When we start to support durable handles we should pass
in_file_id_persistent.
metze
Signed-off-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit c47b3ff25fcc62be3bc96ecf797990e61f5d08ef)
commit 300dde079fbf3363706b8fe22110621486b79238
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jun 8 12:05:56 2012 +0200
s3:smb2_lock: use smb2req->compat_chain_fsp instead of looking it up again
metze
Signed-off-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 09dde2e60ee78a60a7521f2225fed7d8a74620d0)
commit 8d2fba962ac45902df4ac7e7bbb8497f2ea4a144
Author: Stefan Metzmacher <metze at samba.org>
Date: Sat Jun 9 11:09:25 2012 +0200
s3:smbd: set req->smb2req->compat_chain_fsp in file_fsp()
metze
Signed-off-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 6ed9df52ec81a8bca884d452adec92f89fdfe2cd)
commit 3236409a548dcae8cb81f06fddc0cda4ed80be7c
Author: Volker Lendecke <Volker.Lendecke at SerNet.DE>
Date: Thu Jun 14 11:26:44 2012 -0700
Part 2 of fix for bug #8998 - Notify code can miss a ChDir.
Do a ChDir for notify_onelevel.
(cherry picked from commit 0ace3ca03df76a1c22e112ea41d491f90afc0f94)
commit 3d76007f84194f7da2cc4c063aa1d6c47a002832
Author: Volker Lendecke <Volker.Lendecke at SerNet.DE>
Date: Thu Jun 14 11:24:01 2012 -0700
Part 1 of fix for bug #8998 - Notify code can miss a ChDir.
Factor out notify_parent_dir.
(cherry picked from commit 2b92491ba7cc5fd541e3f8988ecf831c3949fb00)
commit 03f7e1e030d4c0500debb487304dcedfbc51f48a
Author: Jeremy Allison <jra at samba.org>
Date: Fri May 11 03:27:01 2012 -0700
Fix bug #8922.
Looking at the do_list status returns was historically
ignored, allowing tar to continue after NT_STATUS_ACCESS_DENIED.
Return to this state.
Autobuild-User: Jeremy Allison <jra at samba.org>
Autobuild-Date: Fri May 11 14:55:53 CEST 2012 on sn-devel-104
(cherry picked from commit 633093685734e44afd7a0de1d58a0ffe905ae13a)
commit a7e42b4b319e7007383a7b157daf5637ab6f4f54
Author: Jeremy Allison <jra at samba.org>
Date: Fri Mar 30 11:58:31 2012 -0700
Complete fix for bug #8811 - sd_has_inheritable_components segfaults on an SD that se_access_check accepts.
(cherry picked from commit e5e86688bdcb91817954fb23ecf10a3b6ddd3933)
commit e93d2142a70c344bcbda623f8d6addb3fd86fc2c
Author: Björn Jacke <bj at sernet.de>
Date: Tue Jun 5 15:37:00 2012 +0200
s3: remove dependency on automake for "make everything"
the dependency was introduced by 737a1c9b96a4ba8d8688f4dba1df6d931e10e64d
We now call auto* in examples/VFS from within the main autogen.sh.
This fixes bug #8978.
Autobuild-User: Björn Jacke <bj at sernet.de>
Autobuild-Date: Tue Jun 5 17:32:22 CEST 2012 on sn-devel-104
(cherry picked from commit 5cc86fd560568202bef069eb89f5906f20050085)
(cherry picked from commit 2041ef3df94842822102d371029cbb14a7f2c024)
commit a4979cf84d5fc449b67f6814f67f11928e881dfb
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jun 13 10:48:32 2012 -0700
Fix bug #8972 - Directory group write permission bit is set if unix extensions are enabled
We can't manipulate file_attributes if it's a posix call.
(cherry picked from commit bb750d7232bd266c06a14ac3ea577aeecfb81b14)
commit 48c601c4dff6f7799dbf96f7dcc7965f8274246a
Author: Matthieu Patou <mat at matws.net>
Date: Fri Jun 1 15:33:04 2012 -0700
s3-winbindd: call dump_core_setup after command line option has been parsed
Without this fix in some situations winbindd can't coredump.
Such cases append when samba is compiled in a custom prefix (ie.
/home/build/mat/prod/1/) in this case get_dyn_LOGFILEBASE or basename(lp_logfile)
before the configuration file and the command line is parsed will be something like /home/build/mat/prod/1/var
which might not exists on the host where you run it (where it's most
probably more "normal" directories).
Specifying --log-basename didn't help as dump_core_setup is called before the command line and
the config file is read so it didn't help getting a correct value in dump_core_setup.
We fix this issue by calling dump_core_setup() also after the command
line has been read and also after the configfile has been parsed so that
the final location for the coredump is coherent with the final logile
location.
Fix bug #8975 (winbindd can't coredump).
(cherry picked from commit 4cf3fb815610c6f0939f8b142296cd836faac7e6)
commit 1985c531a1898c8f08b0c97fbab4ecede0141bf5
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Jun 4 15:59:35 2012 -0700
Fix bug #8311 - Winzip occasionally can not read files out of an open winzip dialog.
Backport of the changes in master without the VFS change. Move
all processing into smb_fsctl().
(cherry picked from commit 87d75c675ccd1cd455afb67e149ce1e835ad6b21)
commit af02273b76a792ca71fcb369a2a647496c948531
Author: Alexander Bokovoy <ab at samba.org>
Date: Thu Jun 7 18:24:38 2012 +0300
s3-librpc-crypto: avoid crash with MIT krb5 1.10.0 in gss_get_name_attribute()
gss_get_name_attribute() can return unintialized pac_display_buffer
and later gss_release_buffer() will crash on attempting to release it.
The fix on MIT krb5 side is in 1.10.1, reported in both Debian and MIT upstream:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=658514
http://krbdev.mit.edu/rt/Ticket/Display.html?user=guest&pass=guest&id=7087
We need to initialize variables before using gss_get_name_attribute()
Fix bug #8988 (avoid crash with MIT krb5 1.10.0 in gss_get_name_attribute()).
(cherry picked from commit 185c2054fd22de0ab07a762a279a7ef0db5d802c)
commit 437274c5f923940836fca4494a03f893f5e4217f
Author: Jeremy Allison <jra at samba.org>
Date: Fri Jun 1 12:28:33 2012 -0700
We are triggering the cleanup_timeout_fn() too often, on exiting when an smbd is idle.
Calls to exit_server_cleanly() should be treated as a "clean" shutdown,
and not trigger the master smbd to call cleanup_timeout_fn.
The last 2 patches address bug #8971 (cleanup_timeout_fn() is called too often,
on exiting when an smbd is idle.)
(cherry picked from commit 8b3b1aa4ff76d7f03285e3fa87f30f3068a7ea5d)
commit 7d6d5cc32987ac34f4c37665a4942e0e54ba20c1
Author: Jeremy Allison <jra at samba.org>
Date: Fri Jun 1 12:02:04 2012 -0700
Stop spamming the logs with "Could not remove pid XX from serverid.tdb" messages and initiating the cleanup function on every process deat
We now have many sub-processes from smbd that don't serve SMB1/SMB2 requests and
don't register themselves in the serverid.tdb. Only initiate the cleanup
from processes that were explicitly in the child list.
(cherry picked from commit 777ac04a99467594805a03635b04011c495ff7e7)
commit 7f42c03b79cc37745bf701aace1d008106f91578
Author: Volker Lendecke <vl at samba.org>
Date: Tue May 29 15:31:49 2012 +0200
s3: Fix uninitialized memory read in talloc_free()
Thanks to laurent gaffie <laurent.gaffie at gmail.com> for reporting
this issue!
(cherry picked from commit 445f314614e4e514a70ff5f1fbbfedb4d3ab0aac)
commit ba354beb4cc74399eac6afcd258664f078e1e1d2
Author: Jeremy Allison <jra at samba.org>
Date: Thu May 31 16:25:52 2012 -0700
Forward port of Richard Sharpe's <realrichardsharpe at gmail.com> fix for bug #8970 - Possible memory leaks in the samba master process.
(cherry picked from commit ec7a5f2593b67797fc3924611d3b0b05b807d0bf)
commit 3c3c878e85a2fcec94a9a001787bb3bfcc7240cf
Author: Björn Jacke <bj at sernet.de>
Date: Tue May 29 08:01:40 2012 +0200
s3: fix compile of krb5 locator on Solaris
the krb5 locator plugin on Solaris needs LIBREPLACE_LIBS (bug #8732)
Autobuild-User: Björn Jacke <bj at sernet.de>
Autobuild-Date: Tue May 29 09:58:42 CEST 2012 on sn-devel-104
(cherry picked from commit 3085225e72c75abf84d7740334459cd971ee4c56)
(cherry picked from commit 7ca265423a36c114ac9216a780e005956967eae7)
commit c7f0c086108f8272487348cd7b664b325cad7009
Author: Matthieu Patou <mat at matws.net>
Date: Tue Jan 24 21:29:11 2012 -0800
s3-pid: Catch with pid filename's change when config file is not smb.conf
This is what is done in pidfile_create
(cherry picked from commit 9b43ad4fcac1eb6796973336c5614b18a054080d)
Fix bug #8714 (smbcontrol can't find the pid file of winbindd because the later
is created with a different name).
(cherry picked from commit 1a596076697624545f415eb558c4647267cfe46c)
commit 35f39d71a9acf0bb680a33a96475709d010c38b4
Author: Jeremy Allison <jra at samba.org>
Date: Thu May 31 21:19:53 2012 +0200
Fix bug #8627: Crash bug in dns_create_probe.
Fix crash bug in dns_create_probe when dns_create_update fails.
(cherry picked from commit ddad733a2166fb629157298a54a5ccc10a6b11fe)
commit e360b953eff11b62749220aed0b2e0dd1a5d97c4
Author: Herb Lewis <hlewis at panasas.com>
Date: Tue May 29 16:38:53 2012 -0700
Second part of fix for bug 8953 - winbind can hang as nbt_getdc() has no timeout.
If we're running with SEC_ADS and we don't get a cldap response from
the server when querying its name, don't fall back to NetBIOS requests
as they're unlikely to succeed.
Signed-off-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit b0a17d803dea133146ac9ee1a25c87fea7bd4cd8)
commit d2a03ca2a432b54d5c681d4cf5999ed7d1d93609
Author: Jeremy Allison <jra at samba.org>
Date: Tue May 29 16:37:35 2012 -0700
Fix bug #8953 - winbind can hang as nbt_getdc() has no timeout.
Add a timeout_in_seconds parameter to nbt_getdc() to make it fail
after that time with NT_STATUS_IO_TIMEOUT.
(cherry picked from commit 0d9d67d180ffea2a4e1942ec0c34ce3b4910fe18)
commit 3fcc3d0addb0e207d2d3ca97d8f9b02214fbd485
Author: Jeremy Allison <jra at samba.org>
Date: Fri May 25 09:16:50 2012 -0700
Fix bug #8373 - Can't join XP Pro workstations to 3.6.1 DC.
Treat LIBNDR_FLAG_NOALIGN and LIBNDR_FLAG_REMAINING the same as the
other align flags - make them mutually exclusive.
Combined work from Metze, Günther and Jeremy.
(cherry picked from commit 035342c11719d1daa647c0b2ae7cec27a969f83a)
(cherry picked from commit dea11050ae2e9b2dd4ceb231760d41b68e11f5fd)
commit 32fe0352c4935182aadba0563ce3a286e0c549b0
Author: Ira Cooper <ira at wakeful.net>
Date: Wed May 30 11:50:06 2012 -0700
Fix bad bugfix for bug #8910 - resolve_ads() code can return zero addresses and miss valid DC IP addresses
Original code incorrectly used a while() instead of a for() loop.
We need to iterate over the entire array here.
Autobuild-User: Jeremy Allison <jra at samba.org>
Autobuild-Date: Wed May 30 23:29:03 CEST 2012 on sn-devel-104
(cherry picked from commit fc7e1113c34819de6fc8053fb81ee2e0e970bec2)
(cherry picked from commit 6797759a36b50f82fb1f75a4cc9c2555a79073a2)
commit 12443f27739c41410d389468230bd50ba74643f9
Author: Jeremy Allison <jra at samba.org>
Date: Mon Apr 23 17:49:49 2012 -0700
Fix bug #8882 - Broken processing of %U with vfs_full_audit when force user is set.
When doing a "force user" we need to remember what the "sanitized_username"
was from the original connect.
(cherry picked from commit f68121db6f78680a328acec11f475ccca3184412)
commit 68904685d41ee598f113cb7612f4b3ba668fc085
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri May 18 22:02:57 2012 +1000
s3-utils: Use ads_do_search_retry in net ads search
This makes it possible to search against a slow server, as will
fallback from 1000 to (eventually) 125 users at a time.
Andrew Bartlett
The last 4 patches address big #8943 (Slow but responsive DC can lock up
winbindd for > 10 minutes at a time).
(cherry picked from commit 04a9988ffa60b0ca32923da20a0d25d14aa460e4)
commit 5093c24137a52ab7e6299924831751d167295311
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri May 18 22:01:14 2012 +1000
s3-libads: Use a reducing page size to try and cope with a slow LDAP server
If we cannot get 1000 users downloaded in 15seconds, try with 500, 250
and then 125 users at a time.
Andrew Bartlett
(cherry picked from commit 0f58ea6c58d78c845aa3fda22c238f126620d226)
commit 94d1daa982a614cbcb4b6b07aa218f8d4d96f3e1
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri May 18 17:40:59 2012 +1000
s3-winbindd: Always map the LDAP error code to an NTSTATUS
We do this so that we catch LDAP_TIMELIMIT_EXCEEDED as NT_STATUS_IO_TIMEOUT, which
has special handling in winbindd_cache.c
Andrew Bartlett
(cherry picked from commit 483a01ea7f50227cb5328c52d8b71a2a31e7acea)
commit 625b834f5ac7c9f4a11f98cdb4fbb7d8d7b5eb0e
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri May 18 17:38:48 2012 +1000
s3-libads: Map LDAP_TIMELIMIT_EXCEEDED as NT_STATUS_IO_TIMEOUT
This allows Samba to then handle this error in the same way it would for RPC connections
Andrew Bartlett
(cherry picked from commit 80e60a8f824f3d709fc45ec11e3ee0a161a622d8)
commit 7bc591a621a8ba4b83b25501e247a01c2be80750
Author: Jeremy Allison <jra at samba.org>
Date: Mon Apr 30 11:05:51 2012 -0700
Fix the loop unrolling inside resolve_ads(). If we don't get an IP list don't use interpret_string_addr(), as this only returns one address, use interpret_string_addr_internal() instead.
Autobuild-User: Jeremy Allison <jra at samba.org>
Autobuild-Date: Mon Apr 30 23:21:16 CEST 2012 on sn-devel-104
(cherry picked from commit 1270cfb45ffa0bbcacf7254b5b45f492a8dcde77)
The last 4 patches address bug #8910 (resolve_ads() code can return zero
addresses and miss valid DC IP addresses).
(cherry picked from commit 79658018ec73755bbd495963f977af61b4497bfb)
commit b160634cda800528873b31a3f95d9e1a2f3c1c5b
Author: Jeremy Allison <jra at samba.org>
Date: Fri Apr 27 16:25:58 2012 -0700
Protect all of the name resolution methods from returning null addrs. Ensure all returns go through remove_duplicate_addrs2(). (cherry picked from commit 11973608186926e5417ee81c8709ea5b0a7ef2e1)
(cherry picked from commit 495f12d932a2ec2848a17917e6f1aa39590dc97d)
commit ef5541ddba8bead24df0c1b7248c49e679ac7414
Author: Jeremy Allison <jra at samba.org>
Date: Mon Apr 30 14:45:43 2012 -0700
Fix convert_ss2service() to filter out zero addresses.
(cherry picked from commit d259cd40204108d262b6b3c18d1f2a9f9d0fee42)
commit 1f5fc8d9d74f3b710eeb9b3a50ce6ee5d418970f
Author: Jeremy Allison <jra at samba.org>
Date: Fri Apr 27 16:02:15 2012 -0700
Fix remove_duplicate_addrs2 to do exactly what it says. Previously it could leave zero addresses in the list. (cherry picked from commit 01e884675e3d1cffb0149108225fbd21c3a73f4e)
(cherry picked from commit d7bddfe22aca1663554757e9245232718adec92d)
commit d288de3e7f195495ccf938ebb21ba10e2976034b
Author: Jeremy Allison <jra at samba.org>
Date: Fri May 25 17:19:29 2012 -0700
Fix bug #8957 - Typo in pam_winbindd code MUST fix.
(cherry picked from commit ee4ef9a535a2d9db11bd94987fb96ae8f8771e79)
commit c4fd9ff890e2640ef90b4d7129621e3fe800a61e
Author: Ira Cooper <ira at samba.org>
Date: Wed May 23 21:39:03 2012 -0400
s3-passdb: Fix negative SID->uid/gid cache handling. (bug #8952)
-1 uid/gid signals a non existent uid/gid.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit baac32c43460ed5e78e7f8bb2304f79cae2b15ef)
commit e49e3d880080957cacf29070e3ddb673cd8cbb2c
Author: Andreas Schneider <asn at samba.org>
Date: Mon May 14 10:31:32 2012 +0200
s3-auth: Don't lookup the system user in pdb.
This fixes bug #8944, ldapsam:trusted and ipasam. It is an additional
fix for bug #8567 (0528cb5f3a15b72dcb34ece21a3ffb3e7b8d6eb9).
Signed-off-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 96b6f3a4777fa3288ee071e01bf293c28002fc5f)
commit 524cf8320d83fcb4b183d25f1f425bc6bbbeba43
Author: Richard Sharpe <realrichardsharpe at gmail.com>
Date: Wed May 16 20:21:34 2012 -0700
Check the return from create_acl_blob
Autobuild-User: Richard Sharpe <sharpe at samba.org>
Autobuild-Date: Thu May 17 07:17:29 CEST 2012 on sn-devel-104
(cherry picked from commit 632af6645376185500820a5be9dbf5c0c3d1e515)
The last two commits address bug #8945 (vfs_acl_common discards errors from
writing to the underlying storage).
(cherry picked from commit 865eca15e080d9eb9e81e91985d6859e316ce081)
commit 28e9488814838b4d5975fa2bf57bd19202fa22a5
Author: Richard Sharpe <realrichardsharpe at gmail.com>
Date: Tue May 15 07:47:14 2012 -0700
Fix the overwriting of errno before use in a DEBUG statement and use the return value from store_acl_blob_fsp rather than ignoring it.
Autobuild-User: Richard Sharpe <sharpe at samba.org>
Autobuild-Date: Wed May 16 03:43:41 CEST 2012 on sn-devel-104
(cherry picked from commit bfe4a2baeec6bc4558a617ec67532ea11f865861)
(cherry picked from commit a398d1bc102933da01d126f2c893ad393f1fb1d2)
commit ccb21129ae3f41b6f01bdec7d466187a5b017bb3
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri May 11 16:26:25 2012 +0200
WHATSNEW: Start release notes for 3.6.6.
Karolin
(cherry picked from commit 6ea4ad30f4d3c30f824f278c7a93347887942514)
commit 57e929f4e040e32897645887fd1e6ca888b74500
Author: Björn Baumbach <bb at sernet.de>
Date: Fri Oct 28 05:43:05 2011 +0200
s3-printing: Add new printers to registry.
This fixes bug #8554, #8612 and #8748.
Pair-Programmed-With: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 8a553705d9045dbbc3ab71189f2496fe97e1a802)
commit 338acadd1446c9e22a69b29773d4bd6cf6b03d01
Author: Alejandro Escanero Blanco <aescanero at gmail.com>
Date: Wed May 9 11:35:51 2012 +0200
s3:auth/server_info: the primary rid should be in the groups rid array (bug #8798)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Autobuild-User: Stefan Metzmacher <metze at samba.org>
Autobuild-Date: Wed May 9 19:36:01 CEST 2012 on sn-devel-104
(cherry picked from commit 6132cf2a5cd77c79546a2d6cc3fbf3c93f54183b)
(cherry picked from commit 6eae984cfc3ceb0661f7993c9274e048c6eda6e0)
commit 845b68daf00a82403532f314323feba69ff75c41
Author: Michael Adam <obnox at samba.org>
Date: Fri May 4 18:01:00 2012 +0200
s3:registry: return error when Key does not exist in regdb_fetch_values_internal() (cherry picked from commit 8a723ddfc1645e52830fb5f47a34f032f9c38931)
(cherry picked from commit 32cf92f2388c0fc26e24c3174fab43089bffba03)
commit 010f445d41837a33e510a43dd786fca6bad4cdbf
Author: Michael Adam <obnox at samba.org>
Date: Mon Apr 23 16:44:15 2012 +0200
s3:registry: replace call to reg_openkey() in reg_createkey() by accesscheck. (cherry picked from commit c1cc15c33be8926ffef173b514d0fb260292d9a3)
(cherry picked from commit 2b29bfcf593aa8a80e1e4cab1d344f5a70036c6e)
commit b9c45a39134ab7ff86b721760d813dedf1bd806b
Author: Michael Adam <obnox at samba.org>
Date: Mon Apr 23 16:13:29 2012 +0200
s3:registry: remove a superfluous fill_subkey_cache() in reg_createkey()
Pair-Programmed-With: Gregor Beck <gbeck at sernet.de>
(cherry picked from commit 03ae7117df2ae42213a3ef9a5ea3adad2bf264e0)
(cherry picked from commit 404c9cec7e538a8301ad1a57f04ec4f4f05e80e1)
commit 71f9cf7bfad5f35cc0bb9ffead34d6fcfd076274
Author: Michael Adam <obnox at samba.org>
Date: Mon Apr 23 16:07:21 2012 +0200
s3:registry: use fill_subkey_cache to check exsistence in regkey_open_onelevel().
Pair-Programmed-With: Gregor Beck <gbeck at sernet.de>
(cherry picked from commit af9d70fbce541c382a5fc54b1cc1af9b0b60a692)
(cherry picked from commit 98c96425420485ae1609a16a88d8af4310fa85d6)
commit 88fa5274b10a490d19eb710f19c43edbac93f27e
Author: Michael Adam <obnox at samba.org>
Date: Mon Apr 23 16:05:33 2012 +0200
s3:registry: let fill_subkey_cache return WERR_BADFILE when the subkey list could not be loaded
WERR_NO_MORE_ITEMS seems inappropriate.
Pair-Programmed-With: Gregor Beck <gbeck at sernet.de>
(cherry picked from commit 4b3dca83bf0da405524a64ca19771fd747ebe267)
(cherry picked from commit 015033657a9b4bf0de043cbc00e1513616c2d714)
commit 54cd4ef619b88b232aa0d5e9541cf632ca0d64cc
Author: Michael Adam <obnox at samba.org>
Date: Mon Apr 23 15:47:33 2012 +0200
s3:registry: convert reg_openkey() to use talloc instead of SMB_STRDUP etc (cherry picked from commit 42dd99d85ca04c10691f78d6340c6b702ade974b)
(cherry picked from commit 086c1e96b412688691639e89eb6cb947710eedb0)
commit 8b425ce0e062107fdd9a34091c9c484d54c5bc09
Author: Michael Adam <obnox at samba.org>
Date: Mon Apr 23 15:30:38 2012 +0200
s3:registry untangle an assignment from the check in regkey_open_onelevel() (cherry picked from commit 12b7b4f0a7d8607dc206c32a3822d5678c14d43b)
(cherry picked from commit 7a36a22f00d8b5024df04932eb60ec9ffa5c2932)
commit 2e698d9230187e96f50ee87a3d0283ac30bfdc3c
Author: Michael Adam <obnox at samba.org>
Date: Mon Apr 23 15:29:41 2012 +0200
s3:registry: untangle assignment from check in regkey_open_onelevel() (cherry picked from commit 52d3c5c14898b5f2514d1512289370eb6f6fd369)
(cherry picked from commit e4fc313293c35dda0ff35392dbcdccbfda0e1d24)
commit 325556480fa6d085011765d13b0a0dc263c92afc
Author: Michael Adam <obnox at samba.org>
Date: Wed Apr 11 15:51:40 2012 +0200
s3:registry: fix seqnum race in regdb_fetch_keys_internal
This prevents race between fetching seqnum and key content.
Because there is currently no way to atomically fetch the
record along with the seqnum, I use a loop.
This is far from optimal and should should ideally be done
differently. But for now it fixes the race.
(cherry picked from commit 66fcac5e479a530091ecb43d9f8cf90f4351ad17)
(cherry picked from commit 521c7ea32d36263d218d98fc31420afc1b7cb0e1)
commit 4c23d381b524b0e1a7342eb9365df9ee5207c5fa
Author: Gregor Beck <gbeck at sernet.de>
Date: Wed Jul 13 16:51:54 2011 +0200
s3:registry avoid pruning the sequencenumber while flushing the regsubkey_ctr
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Autobuild-User: Stefan Metzmacher <metze at samba.org>
Autobuild-Date: Fri Jul 15 08:34:47 CEST 2011 on sn-devel-104
(cherry picked from commit 5049e3e142977a4c3d0f5a0fd9c06429f4d85bed)
(cherry picked from commit 2517f435574876ad44bf0212f507114a610f2377)
commit 38cf6c6fc4ec1e8d6d8cce1233cc2c9f21e7491e
Author: Michael Adam <obnox at samba.org>
Date: Wed Apr 11 15:48:02 2012 +0200
s3:registry: fix seqnum race in fetch_values_internal
This prevents race between fetching seqnum and key content.
Because there is currently no way to atomically fetch the
record along with the seqnum, I use a loop.
This is far from optimal and should should ideally be done
differently. But for now it fixes the race.
(cherry picked from commit 13bccba3c2f6e6fdda2b4a40dd4b1e250a98a7ef)
Conflicts:
source3/registry/reg_backend_db.c
(cherry picked from commit 11413a95a2db14ef14a8f8f4fcb1f11adf44e7a0)
commit 3a42d5612837908a64d54fecab7bfeccf605fa66
Author: Michael Adam <obnox at samba.org>
Date: Wed Apr 11 16:02:44 2012 +0200
s3:registry: update the seqnum in the subkey cache at the end of regval_store_keys
The purpose is to prevent next reads from going to disk.
Note that this will currently only be effective with local tdbs, not
with ctdb: For tdb, store and delete bump the seqnum while transaction
commit does not. For ctdb, transaction commit bumps the seqnum, while
store and delete don't... This needs fixing (in ctdb).
(cherry picked from commit 16d83149c1b5620598edd37bbd1a73bebec82b6e)
(cherry picked from commit 96f08f6d43cb9bebda175efd5719ca15549a5b99)
commit ca56054a5a62b96904642580f83f1a871b607ffb
Author: Michael Adam <obnox at samba.org>
Date: Wed Apr 11 15:38:29 2012 +0200
s3:registry:db: update the value container seqnum after storing/deleting to prevent next read from going to disk if possible
Note that this will currently only be effective in the local TDB implementation.
For CTDB, this wont work since seqnum currently works differently there (needs
fixing): For tdb, store and delete operations bump the db seqnum, while
transaction commits don't. For ctdb, the seqnum is bumped by the transaction
commit but not by store and delete operations.
(cherry picked from commit 13347d11c0e918f82e7e3c21125acc5e241d389f)
(cherry picked from commit f4d800d8d010e638d37d993d8eef00645398f811)
commit 8e2a2dd00a7ffda52e7b4cebf6eeeeb822aaeb16
Author: Michael Adam <obnox at samba.org>
Date: Thu Apr 12 22:53:24 2012 +0200
s3:registry: wrap reg_deletekey() into a transaction
This is wrong layering but fixes a race condition.
(cherry picked from commit e3ad0456515c97f6697190c86b8cec4af8e1e190)
(cherry picked from commit 8980168a16463e1d4fabd5a96f8385882aa0fe7b)
commit db9a3fe28703c8af91eb2af3c212799d067d72bb
Author: Michael Adam <obnox at samba.org>
Date: Thu Apr 12 22:17:35 2012 +0200
s3:registry: wrap reg_createkey() in a transaction
This is wrong layering (calling into regdb_transaction* in the reg_api code)
but fixes a potential race. It makes the multi-step create procedure atomic.
This should completely be done in the backend.
(cherry picked from commit 65d9b116d0283b010e9e3c9ecf185ca42850838e)
(cherry picked from commit 14d9621c39c67872316c6d4f11387b7c3a6dbb00)
commit 88cdd9c3c13c8f7510e364d1062ae50cf3c460fa
Author: Michael Adam <obnox at samba.org>
Date: Thu Apr 12 17:58:26 2012 +0200
s3:registry: untangle assignments from checks in reg_createkey() (cherry picked from commit 4ac9625fe42ded0717aafdf6eec4c1b2217c3c68)
(cherry picked from commit 95ba1aa132e6097a0d35cbc05296427aebdf21b1)
commit a7e730d3dc59b2a666e79994cbbae24ef03a1607
Author: Michael Adam <obnox at samba.org>
Date: Thu Apr 12 17:52:43 2012 +0200
s3:registry: wrap reg_deletevalue() in a transaction
This is at the wrong layer, but if fixes a race potentially causing
data corruption by concurrent access.
(cherry picked from commit c1208c4a9c10b03579dca3bcd304709e631d3c25)
(cherry picked from commit d67b1813ac563f79ed055a7e918c5f293a7069fc)
commit 39461d29d65d9e520f1218119e5af5f90b62dec3
Author: Michael Adam <obnox at samba.org>
Date: Thu Apr 12 17:46:02 2012 +0200
s3:registry: untangle assignment from check in reg_deletevalue() (cherry picked from commit 585746338bda22ff8337d41c8cc50533c5facf56)
(cherry picked from commit 866faf77f92c17e7dbb21686601c7e45a3f406cd)
commit de325a9ade376dd72985bd56262f7f1b1127d46f
Author: Michael Adam <obnox at samba.org>
Date: Thu Apr 12 13:38:32 2012 +0200
s3:registry: fix race in reg_setvalue that could lead to data corruption
(there was no lock around fetching the values and storing them)
The layering is wrong in that it uses regdb transactions in reg_api
(cherry picked from commit 9220377ceebf05e756fd108cbd30b503598e0fb8)
(cherry picked from commit e2d087619076e8c7ec9e46e63037753d8c07138f)
commit 0e838859c832237ddafeeb1a4cf7bede6570a5cc
Author: Michael Adam <obnox at samba.org>
Date: Fri Apr 20 15:19:47 2012 +0200
s3:registry: untangle assignment from check and add a debugmessage in reg_setvalue() (cherry picked from commit a81d399456eb86ffb60bed8704cd8c7864b742db)
(cherry picked from commit a5025e27890a96b11d8d2119ca72a27b929aa2bc)
commit f556688115028e119f625e6108a89f1393050732
Author: Michael Adam <obnox at samba.org>
Date: Thu Apr 12 08:18:04 2012 +0200
s3:registry: don't leak the old contents when updating the value cache (cherry picked from commit 0bf44361caace3a4974dafa305033fb926d0f6d6)
(cherry picked from commit 488b94637952de1cc6251f2d4267ee361b041a0e)
commit 5d8ed8b4923ccd1eb7c11c5e6c994134e1006c96
Author: Michael Adam <obnox at samba.org>
Date: Fri Mar 30 15:39:58 2012 +0200
s3:registry: fix debug message in regdb_store_values_internal() (cherry picked from commit c46403f74116708f2f8b1d531f5881bb9d7f2a84)
(cherry picked from commit b6aaf6b043699cd2d518100ac2934190e3d51639)
commit ac02f6503244b34495f519978dead9715edbeaa1
Author: Michael Adam <obnox at samba.org>
Date: Fri Mar 30 15:35:14 2012 +0200
s3:registry: improve log message in regdb_unpack_values() (cherry picked from commit ae441d97cdbe8e35cd342ba979bacc3757c06cb7)
(cherry picked from commit bdbfde84e2b722cc8697228d8abdb0663f4addd7)
commit cafa92f97fa43e506ad90ab207e798e7c13ffdae
Author: Michael Adam <obnox at samba.org>
Date: Fri Mar 30 15:14:01 2012 +0200
s3:registry: fix a debug message typo (cherry picked from commit 9f82e1175f28bdc1c09e7bd795699b29049a77e3)
(cherry picked from commit 6413d234911ab9211cf05b89412162d864b89c0a)
commit f3b210eb0c4ac106984c2298fc6f092b7de3bdc7
Author: Michael Adam <obnox at samba.org>
Date: Fri Mar 30 14:39:50 2012 +0200
s3:registry: add a new function regval_ctr_value_byname()
This is like regval_ctr_key_exists() but does not return bool,
but the regval_blob instead, if found, and NULL if not found.
(cherry picked from commit b037d5461a7a9a2e51a3dd2794fcc47dfcff4468)
(cherry picked from commit 18d3d3f34c355b182bdb0327a8e4d890965f1594)
commit 490b7794cdcdc0a776288c4eb3b809ec8ee7eb92
Author: Michael Adam <obnox at samba.org>
Date: Fri Mar 30 14:33:39 2012 +0200
s3:registry: rename regval_ctr_key_exists() to regval_ctr_value_exists() (cherry picked from commit 60cdf3c8b5bbda9434f0d8a05fc581ab41b42d5c)
(cherry picked from commit b712448006fe5d31d9c8db164ffd7b0f0ee1191f)
commit 9a7dc355e1237a9174b6fb5e45727fd3e8f192d6
Author: Michael Adam <obnox at samba.org>
Date: Fri Mar 30 01:00:51 2012 +0200
s4:torture:rpc:spoolss: also initialize driverName before checking it in test_PrinterData_DsSpooler() (cherry picked from commit 46428f96a4089925355b4eeebebb8d7f27e2ec0b)
(cherry picked from commit 4cfbe636d4398e4486a6e402a86e53b77f4aaaf9)
commit 30e10fc3ce5502dd57474b5141f3b6606ab96a04
Author: Michael Adam <obnox at samba.org>
Date: Fri Mar 30 00:10:14 2012 +0200
s3:registry:reg_api: fix reg_queryvalue to not fail when values are modified while it runs (cherry picked from commit 5d26120b5ab180212d570dd256e8989e0c80224d)
(cherry picked from commit b356e42c0828049af8b8f3b5b977aee89c086db6)
commit 578b1234d92bd117a2ee15cad0902825e65d8f9a
Author: Michael Adam <obnox at samba.org>
Date: Sat May 5 02:12:25 2012 +0200
s3:registry: implement values_need_update and subkeys_need_update in the smbconf backend
It simply calls to the regdb functions.
This fixes a caching issue uncovered by recent changes.
(cherry picked from commit bff7589818e602ace6cd0a4125d5f6a2ba97cded)
(cherry picked from commit f2ab0372049f839c9201bc326030163996dec769)
commit 7e0c5d1098c31510f0e2a0c6e69647e7d88461e9
Author: Steve Langasek <steve.langasek at ubuntu.com>
Date: Wed May 9 07:56:00 2012 +0200
Fix bug 8920, null dereference
Description: Avoid null dereference in initialize_password_db()
When initialize_password_db() is called with reload=True, it's assumed that
the free_private_data member of pdb_methods is non-null. This is not
necessarily the case, as the tdb backend has no private data and therefore
no free function. Check to see if we have private data that needs freed
before calling.
Author: Steve Langasek <steve.langasek at ubuntu.com>
Bug-Ubuntu: https://bugs.launchpad.net/bugs/829221
(cherry picked from commit da5c342b6d3d3c05a8ab42bb40eb2e77d7b40ec2)
commit 18db653a2e5b83d589a4b4e03adf2937ad3f6a82
Author: Jeremy Allison <jra at samba.org>
Date: Thu May 10 09:53:57 2012 +0200
s3-pam_winbind: Fix the build.
Jeremy
Part of a fix for bug #8915 (Samba fails to build with iniparser-3.0.0 and
iniparser-3.1.0).
(cherry picked from commit 00c901a5be83bfe4c70eccbe7fa2a35d3d2a368d)
commit a63a607e59d6b6466df050294c3fc1eba13f6159
Author: Simo Sorce <idra at samba.org>
Date: Wed May 9 13:55:41 2012 +0200
Fix pam_winbind build against newer iniparser library.
iniparser_getstr is deprecated and has been removed in newer libraries
available in Fedora. Use iniparse_getstring instead.
Autobuild-User: Simo Sorce <idra at samba.org>
Autobuild-Date: Tue Apr 24 02:56:10 CEST 2012 on sn-devel-104
Based on commit adbace20a24b6ae4fbd6d17b7153833f4ac8c88d in master.
(cherry picked from commit e295905f2840b5e814f88cd483b7f5f0fb3b4150)
commit cca7741d3aff35de8101f5f5fca241ce2e60ed1d
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue May 8 16:33:07 2012 +0200
s3-docs: Fix bug #7930.
Add hint that setting "profile acls = yes" on normal shares can cause trouble.
Karolin
Autobuild-User: Karolin Seeger <kseeger at samba.org>
Autobuild-Date: Tue May 8 18:47:59 CEST 2012 on sn-devel-104
(cherry picked from commit 4cc04a29247a0c4b3de9884890364a5712534073)
(cherry picked from commit 5efc31595beae5ec661d0bf6d001bcfbf59bc446)
commit 594f52101cfafc6fc7318b7ddd918fe02f40624d
Author: Richard Sharpe <realrichardsharpe at gmail.com>
Date: Tue May 8 14:53:10 2012 +0200
s3-VFS: Fix building out-of-tree modules.
Fix bug #8822 (VFS module init function name has to be manually changed
depending on build environment).
(cherry picked from commit d2f4164e3db2c341ff3a1b35a68f691848c9a859)
commit b82584a6766b50c54c0744519b558b9a76624e81
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue May 8 12:01:28 2012 +0200
s3-docs: Fix several typos.
Part of a fix for bug #7938. Based on a patch provided by John Bradshaw
<john at johnbradshaw.org>.
Karolin
(cherry picked from commit 3522cbb537069286b55264bfdd5484c278d76181)
commit 15bc08937fb6f7b27b8079a1700c9a50cba0941b
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue May 8 11:05:37 2012 +0200
s3-docs: overrided -> overridden
Fix typo. Part of a fix for bug #7938. Based on a patch provided by John
Bradshaw <john at johnbradshaw.org>.
(cherry picked from commit 6b4890246ddbd606484e7247bea86c238cc0a057)
commit c756bf8549308ecf4a499bff4a6680b20b82a342
Author: Björn Jacke <bj at sernet.de>
Date: Tue May 8 14:10:51 2012 +0200
s3/ldap: remove outdated netscape ds 5 schema file
remove outdated netscape ds 5 schema file and put a README there pointing to
the FDS schema file instead. This fixes bug #8869
(commit b31f773ae1640313dc1ba86b334e9bbb9cb31bd6 in master)
(cherry picked from commit 9fd8692a9d066f4e469eb0668ae1f0c8b2c8db6c)
commit 25178c0dff34b73376ac4946e5aa3befde010227
Author: Joseph Tam <jtam.home at gmail.com>
Date: Thu Apr 19 11:46:16 2012 -0700
Fix bug #8877 - Syslog broken owing to mistyping of debug_settings.syslog.
Setting "syslog only = yes" did not divert log messages to syslog. The test in
lib/util/debug.c:Debug1():747
if( syslog_level < state.settings.syslog )
produces wrong results since .syslog is typed "bool" rather than "int".
The attached patch fixes this by typing this field correctly as "int".
Autobuild-User: Jeremy Allison <jra at samba.org>
Autobuild-Date: Fri Apr 20 00:06:12 CEST 2012 on sn-devel-104
(cherry picked from commit 00d5f32025bf13285ab3f8ffae914107c9eca275)
Signed-off-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 50973b96e2e5bf1f8a434a8be986e359a9e3b3e5)
commit 496455087115e939614f55dd268ca881b77b512e
Author: Jeremy Allison <jra at samba.org>
Date: Mon Apr 16 18:17:25 2012 -0700
Bugfix for #8857 - Setting traverse rights fails to enable directory traversal when acl_xattr in use.
We were incorrectly checking the parent directory ACL, instead
of the ACL of the directory we're trying to open.
(cherry picked from commit faafade5dd948918a27284b82384340995d1bf55)
commit 51c5ab6ad302a9452b5c30528f4fc32919039cd6
Author: Jeremy Allison <jra at samba.org>
Date: Mon Apr 16 18:04:51 2012 -0700
Fix incorrect debug - parent_name is never set !
(cherry picked from commit bed05b8d6b10c77a98a73318ba483bafcccb8a34)
commit 902ed7a5d336d3901ca23b6c08ff9409b9d5993b
Author: Jeremy Allison <jra at samba.org>
Date: Fri Mar 30 12:23:07 2012 -0700
Fix bug #8831 - Inconsistent (with manpage) command-line switch for "help" in smbtree
Autobuild-User: Jeremy Allison <jra at samba.org>
Autobuild-Date: Fri Mar 30 22:59:53 CEST 2012 on sn-devel-104
(cherry picked from commit efd94d159883cb0841d8ac83223a1e63098a8d72)
(cherry picked from commit 815ba9db6f9ae405c6e8a590ee96a31cf30ba481)
commit b7403b23ef766ce0599d92ba6b58ac3265f30604
Author: Olaf Flebbe <o.flebbe at science-computing.de>
Date: Thu Apr 12 11:29:41 2012 +0200
Wrong assertion/comparison: Compare value not pointer
Fix bug #8859 (Wrong assertion: Checks pointer not value).
(cherry picked from commit b2f728823e8976e2ce5a2e630134ae8e01d83e82)
commit 940b0167d415e6ebfc3b96c6898e53703d13e7bb
Author: Jeremy Allison <jra at samba.org>
Date: Wed Apr 25 15:17:09 2012 -0700
Fix bug #8897 - winbind_krb5_locator only returns one IP address.
Reported by Dina_Fine at Dell.com.
Don't ask the DC for an IP list when locating kdc's. Ask for the
name and use getaddrinfo to get all possible addresses instead.
(cherry picked from commit 56b0ec0e91f9af0eb6c109fc1cc300ad5fee3fe6)
commit 46fa65cc34b4f5175c5adca5de3b33b520afa885
Author: Jeremy Allison <jra at samba.org>
Date: Mon Apr 9 14:15:22 2012 -0700
Final back port of fix for bug #8837 - smbd crashes when deleting directory and veto files are enabled.
Use ndr encoding to add the NT security token into the stored data when
delete on close is set.
(cherry picked from commit 3d9a8dd1a97f68df7d91cef5afe4dda80cc03454)
commit 69263d7668122391fdea62648ccbbee919c7532e
Author: Jeremy Allison <jra at samba.org>
Date: Mon Apr 9 11:47:27 2012 -0700
Convert parse_delete_tokens_list() and unparse_share_modes() to use ndr encoding for the struct security_unix_token. We can do this as libsmb_share_modes never looks inside the delete tokens list, only implicitly gets the length.
(cherry picked from commit 5b5351022fb81da09d28ab3e7c8c2e2a8956c45e)
commit 369da3f6f08445631bb402c217ff1d1b0dd44ef2
Author: Jeremy Allison <jra at samba.org>
Date: Fri Apr 6 15:39:03 2012 -0700
The delete tokens are unique to each name hash representing a pathname, if we don't correctly return here we'll add duplicate tokens for a given pasname hash.
(cherry picked from commit a66a725f6190fe48b6c83dc7f0e65bac6fa4bbac)
commit 43945e68db7c80507304f2795083b84fc987265c
Author: Jeremy Allison <jra at samba.org>
Date: Fri Apr 6 14:53:48 2012 -0700
Fix the talloc heirarchy when adding the unix delete token.
(cherry picked from commit e691385e25804c744fc820fdd6e039c3cf6b6128)
commit de8fdbe626e35d6e75a1aa972a124b8752f72387
Author: Jeremy Allison <jra at samba.org>
Date: Wed Apr 4 14:57:12 2012 -0700
Third part of fix for bug #8837 - smbd crashes when deleting directory and veto files are enabled.
Use correct check to see if veto files has been enabled. Even if not
set lp_veto_files() returns a valid string address (to a '\0' character).
Autobuild-User: Jeremy Allison <jra at samba.org>
Autobuild-Date: Thu Apr 5 01:36:04 CEST 2012 on sn-devel-104
(cherry picked from commit 704ea4729b499ae2716cfe6ad5d952bcb1251a3b)
(cherry picked from commit 483c25eb0c88178012cec11f713b714c3c54f8d6)
commit e1a24a2ba1303e5ea198d61a5de8d38132310159
Author: Jeremy Allison <jra at samba.org>
Date: Wed Apr 4 14:53:10 2012 -0700
First part of fix for bug 8837 - smbd crashes when deleting directory and veto files are enabled.
Add some const to the sec_ctx code.
(cherry picked from commit f042de2f346c98a852957cdbb09a7f8ac871b69c)
(cherry picked from commit dd2246f0262ef1002bf9e348d6097734596ce100)
commit d256e5ccfca9349ad4c0ef66f3f860114d3ea675
Author: Volker Lendecke <vl at samba.org>
Date: Sat Apr 28 19:51:46 2012 +0200
s3: Fix bug 8904 -- wbinfo --lookup-sids "" crashes winbind
Much of the code further down and up the call chain expects the
structures wb_lookupsids returns to be allocated. Do that despite
we have nothing to look up.
(cherry picked from commit e68662130c6c4c081d23f1a24cc3e9a3d2993224)
commit 83da2ba8a4d599a82d8c15424694e06e361b40d1
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 12 12:15:50 2012 +0200
s3: Fix a segfault with debug level 3 on Solaris
printf can not deal with NULL strings
Fix bug #8861 (smbd crashes on high debug level with anonymous logins).
(cherry picked from commit 237d4dacfed478ce7f23a5f46b609189215259d3)
commit fd37883f88f05b1c0b17bd38e762cb307f56a067
Author: SATOH Fumiyasu <fumiyas at osstech.co.jp>
Date: Mon Mar 26 19:13:12 2012 +0900
s3-docs: Prepend '/' to filename argument (Bug #8826)
(cherry picked from commit 6804e46811dd13cfd405f7c48a3dc2bc6501d75c)
(cherry picked from commit e538c0b1f99853e2921c48db28ef32d33f4fd50d)
commit 8b60e98061c86984e3bc3f6c248e2bc835134acb
Author: Ralph Wuerthner <ralph.wuerthner at de.ibm.com>
Date: Wed Apr 4 17:40:27 2012 +0200
s3-smbd: move print_backend_init() behind init_system_info()
On smbd startup check_published_printers() fails with the following error
messages:
[2012/04/04 16:29:50.511526, 0] printing/nt_printing_ads.c:360(check_published_printers)
check_published_printers: Could not create system session_info
[2012/04/04 16:29:50.512101, 0] printing/nt_printing.c:102(nt_printing_init)
nt_printing_init: error checking published printers: WERR_ACCESS_DENIED
check_published_printers() requires session_info to be set, but
initialization of session_info in main() is done after calling
print_backend_init(). Move print_backend_init() behind init_system_info().
Signed-off-by: Ralph Wuerthner <ralph.wuerthner at de.ibm.com>
Fix bug #8845 (check_published_printers: Could not create system session_info).
(cherry picked from commit 3bdcf3208c8ff1a99bc457549257af83a869b381)
commit 20774b04db599a3e0f5ab99895dcb92578e90598
Author: Björn Baumbach <bb at sernet.de>
Date: Wed Apr 4 16:41:35 2012 +0200
docs: remove whitespace in example samba.ldif (fix bug #8789) (cherry picked from commit 9a68a98e87e5597ba684bea3d5e6a44951e51973)
(cherry picked from commit 6edb03ed1678c4301c559e2f67c131450d3a8cfa)
commit dccc0d5b8565ec057ff4c41b8724d325212c734c
Author: Volker Lendecke <vl at samba.org>
Date: Sat Mar 31 13:37:20 2012 +0200
s3-aio-fork: Fix a segfault in vfs_aio_fork
aio_suspend does not signal the main process with a signal, it just waits. The
aio_fork module does not use the signal at all, it directly calls back into the
main smbd by calling smbd_aio_complete_aio_ex. This is an abstraction
violation, but the alternative would have been to use signals where they are
not needed. However, in wait_for_aio_completion this bites us: With aio_fork we
call handle_aio_completed twice on the same aio_ex struct: Once from the call
to handle_aio_completion within the aio_fork module and once from the code in
wait_for_aio_completion.
This patch fixes it in a pretty bad way by introducing flag variables and more
state. But the mid-term plan is to replace the posix aio calls from the vfs and
do pread_send/recv and pwrite_send/recv at the vfs layer, so this will
significantly change anyway.
Thanks to Kirill Malkin <kirill.malkin at starboardstorage.com> for reporting this
crash!
The last 2 patches address bug #8836 (aio_fork segfaults on "smbcontrol
close-share").
(cherry picked from commit b4abc44a370b8196c72d58a2ed4d8c9bcbc49d17)
commit bddc1ad3d5f8ce6d6730675f94f2eb713ca6c133
Author: Volker Lendecke <vl at samba.org>
Date: Sat Mar 31 13:34:42 2012 +0200
s3-aio-fork: Fix aio_suspend event hierarchy
We end up here multiple times. There's no real point putting the events into
the child struct, at the end of this routine we need to free them anyway.
(cherry picked from commit ee81564123be5e21b87e7003b51467180c3fdcb5)
commit 93338ad8ad4b45d6a7b8c3cc094bb0de56bf4782
Author: Björn Baumbach <bb at sernet.de>
Date: Wed Apr 4 16:58:24 2012 +0200
docs-xml: fix default name resolve order (fix bug #7564)
Autobuild-User: Volker Lendecke <vl at samba.org>
Autobuild-Date: Fri Apr 6 09:54:37 CEST 2012 on sn-devel-104
(cherry picked from commit 189b3d9b24bf553ff7096397c389f20ba99e0dfa)
(cherry picked from commit ad6d51892597336aa162452f3944393fa5afa7c4)
commit 41deac37bdfc696e2969ae8c06230fa2f348c554
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Dec 15 10:00:36 2011 +1100
s3-winbindd Only use SamLogonEx when we can get unencrypted session keys
This ensures that we have some check on the session keys being returned
as the RC4 cipher is not checksumed.
The check comes from the fact that the credentials chain is tied to
the session key, and so if the credentials check passes then the
netlogon session key will be correct, and so the user session key
will be correctly decrypted.
Andrew Bartlett
Part of a fix for bug #8599 (WINBINDD_PAM_AUTH_CRAP returns invalid user session
key).
(cherry picked from commit 8852ad6bd77b44e9dd71de3994869f5603964ef7)
commit c26a263cf953674c96b5acee1f3f1052b37c86de
Author: Richard Sharpe <realrichardsharpe at gmail.com>
Date: Fri Mar 9 14:54:38 2012 -0800
Fix bug #8797 - Samba does not correctly handle DENY ACEs when privileges apply. Signed-off-by: Jeremy Allison <jra at samba.org> (cherry picked from commit 9aafc490db58017133bbd7a7f49264ee0d48f0ff)
(cherry picked from commit 28150366a958a3133dc8e418695b914f2ff3f472)
commit 6cb64ad07a90c0090d568acc0a6ac9385c6243aa
Author: Volker Lendecke <vl at samba.org>
Date: Tue Sep 20 22:45:52 2011 +0200
v3-6-test: Further fix for bug 8338
OS/X can not deal with a 10-vwv read on normal files.
Autobuild-User: Volker Lendecke <vlendec at samba.org>
Autobuild-Date: Wed Sep 21 00:51:08 CEST 2011 on sn-devel-104
(cherry picked from commit 5ca1ff390843e2a0c217a3627297d7af4eadd50d)
commit 5d108fc105900a592d79ee9caf26095875cfbbfc
Author: Christian Ambach <ambi at samba.org>
Date: Tue Mar 13 10:07:11 2012 -0700
Fix bug #8807 - dcerpc_lsa_lookup_sids_noalloc() crashes when groups has more than 1000 groups
Use correct talloc heirarchy.
Signed-off-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 7936fb0ab8c3413768e83975c9d8544d653ee13c)
(cherry picked from commit 8c4491c6ad126771eafa8ea0f54f733f52437a10)
commit 6c0b29e3d3b997e1a33431cd30ca5790ff17ea03
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Mar 2 20:29:58 2012 +0100
Revert "s3: Add sys_statvfs() wrapper support for OpenBSD/FreeBSD/DragonFly."
This reverts commit a0d51949abde68134eb35150d797387a1fb57ab7.
https://bugzilla.samba.org/show_bug.cgi?id=8777
--- Comment #9 from Volker Lendecke <vl at samba.org> 2012-03-02 00:32:41 UTC ---
Karolin, would it be possible that you revert
a0d51949abde68134eb35150d797387a1fb57ab7 from v3-6-test? I did test this on
FreeBSD, but it makes the build fail on NetBSD. This patch needs to grow a bit
in master and is not ready for 3.6.
[...]
Volker
(cherry picked from commit 14fe979a32c94ebd88a934bcfaef3cb754e3c04c)
commit e08c895ae6efb44e4c8fed7dd610c5eaf3b05394
Author: Jeremy Allison <jra at samba.org>
Date: Tue Feb 28 09:47:50 2012 -0800
Fix problem reported by Tom Lee <tlee2951 at gmail.com> - when calculating the share security mask, take priviliges into account for the connecting user.
Autobuild-User: Jeremy Allison <jra at samba.org>
Autobuild-Date: Tue Feb 28 20:21:26 CET 2012 on sn-devel-104
(cherry picked from commit 6081fabe7e0f461ea7d288c40727d4fb5defce5d)
Fix bug #8784 (Open file with SEC_FLAG_SYSTEM_SECURITY mask requested is blocked
by share security mask.)
(cherry picked from commit 5278f1c89191ae56ffe68feac4eb019fbc8336bc)
commit 618f2bdb27f0d97d76da960382d794afadf0ecf4
Author: Matthieu Patou <mat at matws.net>
Date: Fri Feb 10 11:45:21 2012 -0800
s3-winbindd: set the can_do_validation6 also for trusted domain
The flag can_do_validation6 was only set for the domain to which
winbindd is the member. Setting this flag in other domains (trusted
domain) if it's active directory domain is a good idea as it allow to do
level 6 validation also when winbindd is querying them directly.
(cherry picked from commit 05036fab0a9847219c73c0abd931a39fba0bccfd)
Address bug #8599 (WINBINDD_PAM_AUTH_CRAP returns invalid user session key).
(cherry picked from commit 01747a5554839f21992b8845328c4b08c3dd8ff8)
commit fd6223b1aac60e4f9e1f0571886a638dcd3fb8cb
Author: Brad Smith <brad at comstyle.com>
Date: Tue Feb 28 20:45:41 2012 +0100
s3: Add sys_statvfs() wrapper support for OpenBSD/FreeBSD/DragonFly.
Fix bug #8777.
(cherry picked from commit a0d51949abde68134eb35150d797387a1fb57ab7)
commit 020f89f697db707d5302b0aabd9661f1a94f6c67
Author: Matthieu Patou <mat at matws.net>
Date: Fri Feb 24 16:13:10 2012 -0800
s3-winbindd: Close netlogon connection if the status returned by the NetrSamLogonEx call is timeout in the pam_auth_crap path
If not the child process would hang for quite a long time up to the
moment when the connection is cleaned by the kernel (took ~ 20 minutes)
in my tests.
Fix bug #8771 (Winbind takes up to 20 minutes to change from DC 1 to DC 2 and
keeps in the meantime to respond NT_STATUS_IO_TIMEOUT).
(cherry picked from commit 990274481795a47376cdbc95d5f80d830079d702)
commit f71990752db662f6ba5c07ec4d1c5e24c466bd8a
Author: Richard Sharpe <realrichardsharpe at gmail.com>
Date: Wed Feb 22 06:25:54 2012 -0800
Honor SeTakeOwnershiPrivilege when client asks for SEC_STD_WRITE_OWNER but has no permission for that, but token has SeTakeOwnershipPrivilege
Autobuild-User: Richard Sharpe <sharpe at samba.org>
Autobuild-Date: Wed Feb 22 19:19:32 CET 2012 on sn-devel-104
(cherry picked from commit 108253250048673493a636fd9fb2bf99b64ccf3c)
Fix bug #8768 (Samba does not honor SeTakeOwnershipPrivilege when file opened
with SEC_STD_WRITE_OWNER).
(cherry picked from commit 4d603924fa07b908994bdc0a15dcfa2f83a3f1be)
commit d6e18a6d1a30294f9e24513d015026c2db3a6690
Author: Volker Lendecke <vl at samba.org>
Date: Sun Feb 19 12:49:55 2012 +0100
s3: Fix bug 8567 -- segfault in dom_sid_compare
The underlying problem was that with ldapsam:trusted we require the
a group mapping for the primary group of every user, including root.
(cherry picked from commit 57ff85c0d785be074d2c62bb979fbd104db6edfe)
commit b45f5f2dc8d89ff49d430a71e69a0940d660e341
Author: Volker Lendecke <vl at samba.org>
Date: Thu Feb 16 14:22:42 2012 -0800
s3: Add SERVERID_UNIQUE_ID_NOT_TO_VERIFY, bug 8760
Back-port of commit dd5868d41eeaa304a471822d7783526d9f4c37f5
from master. Back-port done by Manoj Dahal <mdahal at novell.com>.
(cherry picked from commit 271a1f42b5dc95bff6ffd93a653ca8a1269e92af)
commit 050cfe9cb06369edcf4cff05e68afe46655523db
Author: David Disseldorp <ddiss at samba.org>
Date: Wed Feb 15 16:30:27 2012 +0100
s3-printing: fix crash in printer_list_set_printer()
The printer list database format was recently changed to accommodate for
the printcap location field.
One of the tdb_pack calls is not provided with a location string
argument, this causes a crash on some platforms.
https://bugzilla.samba.org/show_bug.cgi?id=8762
(cherry picked from commit 43f9e7400a106cd70d12cf50e84a552f3f75a294)
commit 1949e5a4c053c901920acede6f87996ca8a3d07b
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Oct 14 16:11:06 2011 +0200
s3:dbwrap_ctdb: return the number of records in db_ctdb_traverse() for persistent dbs
metze
Autobuild-User: Stefan Metzmacher <metze at samba.org>
Autobuild-Date: Fri Oct 14 20:59:37 CEST 2011 on sn-devel-104
(cherry picked from commit 15b8efeae3b0133ae60a8ce582e4ca4d4dbe6bb1)
The last 4 patches address bug #8527 (db_ctdb_traverse fails to traverse records
created within the current transaction).
(cherry picked from commit fa17a5518ff050234cccc1d35ec3699202a3e941)
commit 66a94f2bf2f8f987ac1a075411581b8509cae164
Author: Günther Deschner <gd at samba.org>
Date: Wed Oct 12 11:48:55 2011 +0200
s3-dbwrap_ctdb: fix the build.
Michael, please check.
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Wed Oct 12 15:25:56 CEST 2011 on sn-devel-104
(cherry picked from commit fc320551d84508371ab1c082752515d538648f49)
(cherry picked from commit b0ac12539673a2e6b19e52f36822850b40d9dfae)
commit 971316f451555344ee0454e3558aa95b6f6f845e
Author: Gregor Beck <gbeck at sernet.de>
Date: Thu Sep 22 13:58:24 2011 +0200
s3:dbwrap: traverse records created within this transaction.
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit a6cd71da858062a66f83775cf655b79b6c8d75e7)
(cherry picked from commit fc5ba7a9cc0e3fd76edb85be72406d0e77788dab)
commit 96815de7894c5bc5fadf12d13ca408f07530d2ca
Author: Michael Adam <obnox at samba.org>
Date: Fri Oct 14 16:33:00 2011 +0200
s3:dbwrap: change the dbwrap_traverse() wrapper to return the count in an additional parameter (similar to commit 8f098a635f713652c4846d71e24c0a199c25b8b7)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 9c5bee9f731b70b0a01248f52adf7622025591c2)
commit c5d775c65c2d907c2e01db5eaec00412c45482a2
Author: Christian Ambach <ambi at samba.org>
Date: Fri Jan 27 10:25:13 2012 -0800
Allow vfs_aio_pthread to build as a static module.
The last 6 patches address bug #8723 (Add pthread-based aio module to 3.6.3.).
(cherry picked from commit 16f900cb94a69a47d627666751d374f097f092f4)
commit 14245b65610f9987ff058ab27891d39493af26af
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jan 25 17:17:48 2012 -0800
Update man page to fix typo vfs_aio_fork -> vfs_aio_pthread, add aio read size, aio write size examples. (cherry picked from commit 12b614a9298974ba5daee7aa8d1aa47006de01e2)
(cherry picked from commit c738f0ea9e1c2356eab1dac778ceb94f22036f0a)
commit 4b09ddf145ebaec41146e70c1ad9b31e8ffe453c
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jan 25 16:54:39 2012 -0800
Add vfs_aio_pthread code.
(cherry picked from commit 0ba64e6bc78404b2f75af638c22b52007159d96b)
commit 9f767f70cd4c944b8b3279cbbaef065346b08178
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jan 25 16:27:54 2012 -0800
Ensure we always free aio_ex on all error paths by moving the TALLOC_FREE call out of smbd_aio_complete_aio_ex() and into the caller.
(cherry picked from commit caa7ccae10f9be77cf28890aadff735ca83de93e)
commit 82cef7a22c7a7736a76b9a5ef89c9a3be6f19998
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jan 25 14:11:12 2012 -0800
Add man page for vfs_aio_pthread module. (cherry picked from commit d8c699190d2cc0ce64395c7b2b10bb25c98a2943)
(cherry picked from commit 00d59a043dc4008f25cdf44dc233d181114dfa2d)
commit 3503b394b1aadf3909386c71e262f5701a20ac73
Author: Jeremy Allison <jra at samba.org>
Date: Wed Dec 21 20:38:32 2011 -0800
Change the signature of pthreadpool_finished_job() to return 0 on success, errno on fail and return the jobid in a separate variable.
I need this fix for my vfs_aio_pthread.c module.
Autobuild-User: Jeremy Allison <jra at samba.org>
Autobuild-Date: Thu Dec 22 12:12:33 CET 2011 on sn-devel-104
(cherry picked from commit 711c18c2301d1bea35cac1144080a94e6b89be27)
(cherry picked from commit b30626720405c435ad48abf8e1445ee8f4b859a3)
commit 7e2fa6922d69e268ee242adb20240a2ef02b611e
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Sep 22 21:04:51 2011 +0200
s3:smb2_server: fix a logic error, we should sign non guest sessions
metze
The last 2 patches address bug #8749 (SMB2: SessionSetup responses are not
signed).
(cherry picked from commit 5bfe963d9279571b8392fabf0373b603014615eb)
commit a2cb122801dada62ec8cf138c8a9e40f2049cf0f
Author: Michael Adam <obnox at samba.org>
Date: Wed Sep 21 03:56:30 2011 +0200
s3:smb2-server: session setup replies should always be signed (except for guest sessions)
not only if the session should be signed
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Autobuild-User: Stefan Metzmacher <metze at samba.org>
Autobuild-Date: Wed Sep 21 11:00:09 CEST 2011 on sn-devel-104
(cherry picked from commit ecb99789acc1cd8a4caa6635291cf5f44fe39e7e)
commit c5ab915faca73103dc50c31bd77b1a35eb02ade8
Author: Ira Cooper <ira at samba.org>
Date: Fri Feb 3 16:47:18 2012 -0800
s3-popt: Fix configure.developer builds on Solaris.
alloca.h needs to be included, or the build complains the implicit
definition of alloca.
Signed-off-by: Jeremy Allison <jra at samba.org>
Autobuild-User: Jeremy Allison <jra at samba.org>
Autobuild-Date: Sat Feb 4 03:27:42 CET 2012 on sn-devel-104
(cherry picked from commit 74ca6d1ddb1c5a4fbe9ddb29566878efe1761897)
Fix bug #8743 (configure.developer build is broken).
(cherry picked from commit 9269f41229368b2614880718e710fd461b28196f)
commit ee4f552ccb0687bc66caedac4660397d1adf1e4e
Author: Christian Ambach <ambi at samba.org>
Date: Wed Aug 24 16:21:37 2011 +0200
s3:winbindd fix a return code check
talloc_traverse_dict will return with -1 in case of an error and
might return positive values that indicate the count of found
entries
Autobuild-User: Christian Ambach <ambi at samba.org>
Autobuild-Date: Wed Aug 24 18:09:11 CEST 2011 on sn-devel-104
Fix bug #8406 (winbind might not return groupnames to getgrgid nss calls).
(cherry picked from commit 9d5ed16ddac1598918338a432e9effa8ab869300)
commit ab97143199c8896e2c0bf8e55439036cc0fea07b
Author: Volker Lendecke <vl at samba.org>
Date: Tue Jan 31 22:26:35 2012 +0100
s3: Add rmdir operation to streams_depot
The last 2 patches address bug #8733 (streams_depot leaves streams around on
rmdir).
(cherry picked from commit 693533ba5b91d74925568f719bdee969c6637ba7)
commit 03943da8bdcf522e5f5a1dd81cd8558de4e7629a
Author: Volker Lendecke <vl at samba.org>
Date: Tue Jan 31 22:26:23 2012 +0100
s3: Delete streams on directories
(cherry picked from commit 9ba7748b5f1c08dbefbb8d9c9646f631c2a355e0)
commit 9d85b176d534057d6c0c542816650e7be88ddf16
Author: Michael Adam <obnox at samba.org>
Date: Wed Feb 1 14:25:12 2012 +0000
s3:smbd:smb2: fix an assignment-instead-of-check bug conn_snum_used()
Accidential "=" instead of "==".
Autobuild-User: Michael Adam <obnox at samba.org>
Autobuild-Date: Wed Feb 1 17:10:15 CET 2012 on sn-devel-104
(cherry picked from commit 6ba09e039e4efee33ce6b8cd9f919409656c2afb)
Fix bug #8738 (SMB2 server will not release unused shares).
(cherry picked from commit 15a423bf373a8116a0de7a627eaaea3932541e88)
commit 06e90f0e89f781e9e68ec903d869eda7537c7ded
Author: Ira Cooper <samba at ira.wakeful.net>
Date: Tue Jan 31 12:15:36 2012 -0800
Fix bug #8729 - getpass regressions on Solaris/Illumos - 3.6 and master.
Autobuild-User: Jeremy Allison <jra at samba.org>
Autobuild-Date: Tue Jan 31 23:28:09 CET 2012 on sn-devel-104
(cherry picked from commit a1901b55cfa658f39a33d0ea120641f56453fe4e)
(cherry picked from commit 6fdeb105904803d5402619419d4dc8bcc4423c35)
commit 205c49e2474dca8cc98c3b07b771ac94f653c50a
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Feb 1 17:04:17 2012 +0100
s3:auth: fill the sids array of the info3 in wbcAuthUserInfo_to_netr_SamInfo3() (bug #8739)
Originally, only the rid array was filled and foreign domain sids were omitted.
Pair-Programmed-With: Michael Adam <obnox at samba.org>
metze
Autobuild-User: Stefan Metzmacher <metze at samba.org>
Autobuild-Date: Thu Feb 2 12:59:32 CET 2012 on sn-devel-104
(cherry picked from commit dab7b0e7171edf5b11af154175711e2b972c000b)
(cherry picked from commit 53109bfa351da21b07ad99fa9b2a26d7c87bfa44)
commit bb6b11e8727d0b6c9d2ee0931e6eb7627ffedeb5
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Feb 1 17:02:52 2012 +0100
s3:auth: fix potential gap creation in wbcsids_to_samr_RidWithAttributeArray()
Pair-Programmed-With: Michael Adam <obnox at samba.org>
metze
(cherry picked from commit adbab7710d1fc4ca31469982dae0ee51e6b19896)
(cherry picked from commit 4e9091a65a9a19511763a09ae6a48ec05fb156d6)
commit 686ad71a2c73b512b65bbf034a217bb4351e3d30
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jan 31 10:02:18 2012 -0800
s3:client: ignore SMBecho errors (the server may not support it) (bug #8139) Signed-off-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit bb28a9387d3c76f6f8c7f79ec61d37a499d6c8f6)
commit 10a4287e9f645773e6ca09e192c68d1ee8636e82
Author: Matthieu Patou <mat at matws.net>
Date: Mon Jan 30 00:05:08 2012 -0800
s3-winbind: don't try to do clever thing if the username is not found while authenticating through winbind
This could cause that we authenticate a user with a bogus domain to
winbind's domain if the password supplied for the PAM_AUTH match.
The problem was reported by Jeff Venable (jvenable at juniper.net).
Patch from Andrew Bartlett (abartlett at samba.org).
Autobuild-User: Matthieu Patou <mat at samba.org>
Autobuild-Date: Mon Jan 30 18:58:12 CET 2012 on sn-devel-104
(cherry picked from commit 56d5cb938651b9c67a8400d1adc61a23889a6a29)
Fix bug #8734 (When using PAM_AUTH API from winbind if Kerberos auth is enabled,
samba will authenticate user with a bogus domain).
(cherry picked from commit a1ea9634fd07d1a949b9f772c36fcfb84c2f230f)
commit c3fab3df51d41c837c29b213e108e43133256ce9
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Jan 27 16:03:55 2012 -0800
Fix for bug #8727 - smbclient fails with posix large reads.
s3-libsmb Do not limit read replies to NBT packet sizes
With the posix extensions, we can read 16MB at a time, so we need to check
the full size of the packet, not the size rounded down to the old NBT
limit.
Signed-off-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit e86ad41af9d50265cab7cfdabdacb40bb4d3acc0)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 152 +++++-
docs-xml/Samba3-ByExample/SBE-MakingHappyUsers.xml | 2 +-
docs-xml/Samba3-Developers-Guide/unix-smb.xml | 2 +-
docs-xml/Samba3-HOWTO/TOSHARG-AccessControls.xml | 2 +-
docs-xml/Samba3-HOWTO/TOSHARG-TDBFiles.xml | 2 +-
docs-xml/Samba3-HOWTO/TOSHARG-VFS.xml | 2 +-
docs-xml/build/DTD/samba.entities | 2 +-
docs-xml/manpages-3/idmap_nss.8.xml | 2 +-
docs-xml/manpages-3/libsmbclient.7.xml | 2 +-
docs-xml/manpages-3/net.8.xml | 2 +-
docs-xml/manpages-3/ntlm_auth.1.xml | 12 +-
docs-xml/manpages-3/pdbedit.8.xml | 20 +-
docs-xml/manpages-3/smbcacls.1.xml | 2 +-
docs-xml/manpages-3/smbclient.1.xml | 6 +-
docs-xml/manpages-3/smbcontrol.1.xml | 2 +-
docs-xml/manpages-3/smbcquotas.1.xml | 2 +-
docs-xml/manpages-3/smbd.8.xml | 8 +-
docs-xml/manpages-3/tdbbackup.8.xml | 4 +-
docs-xml/manpages-3/testparm.1.xml | 2 +-
docs-xml/manpages-3/vfs_aio_pthread.8.xml | 120 ++++
docs-xml/manpages-3/vfs_readonly.8.xml | 2 +-
docs-xml/manpages-3/vfs_shadow_copy2.8.xml | 2 +-
docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml | 6 +-
docs-xml/smbdotconf/filename/maxstatcachesize.xml | 2 +-
docs-xml/smbdotconf/protocol/nameresolveorder.xml | 2 +-
docs-xml/smbdotconf/protocol/profileacls.xml | 8 +-
docs-xml/using_samba/ch07.xml | 2 +-
examples/LDAP/samba-schema-netscapeds5.x | 77 ---
examples/LDAP/samba-schema-netscapeds5.x.README | 2 +
examples/LDAP/samba.ldif | 2 +-
examples/VFS/Makefile.in | 2 +-
lib/addns/dnsrecord.c | 28 +-
lib/popt/system.h | 2 +
lib/replace/replace.h | 11 +
lib/replace/system/passwd.h | 2 +
lib/util/debug.h | 2 +-
libcli/security/access_check.c | 49 +-
librpc/idl/security.idl | 4 +-
librpc/ndr/libndr.h | 8 +-
librpc/ndr/ndr.c | 8 +-
nsswitch/pam_winbind.c | 8 +-
nsswitch/winbind_krb5_locator.c | 35 +-
source3/Makefile.in | 8 +-
source3/auth/auth_util.c | 103 +++-
source3/auth/server_info.c | 67 ++-
source3/autogen.sh | 9 +
source3/client/client.c | 10 +-
source3/client/clitar.c | 2 +-
source3/configure.in | 4 +
source3/include/ads.h | 1 +
source3/include/dbwrap.h | 3 +-
source3/include/nt_printing.h | 4 +
source3/include/proto.h | 6 +-
source3/include/serverid.h | 9 +
source3/include/smb.h | 1 +
source3/lib/dbwrap_ctdb.c | 54 ++-
source3/lib/dbwrap_util.c | 13 +-
source3/lib/fncall.c | 3 +-
source3/lib/pidfile.c | 26 +-
source3/lib/pthreadpool/pthreadpool.c | 9 +-
source3/lib/pthreadpool/pthreadpool.h | 5 +-
source3/lib/pthreadpool/tests.c | 18 +-
source3/lib/secdesc.c | 4 +
source3/lib/serverid.c | 16 +
source3/libads/ads_status.c | 3 +
source3/libads/ads_struct.c | 4 +
source3/libads/ldap.c | 4 +-
source3/libads/ldap_utils.c | 7 +
source3/librpc/crypto/gse.c | 20 +-
source3/libsmb/clidgram.c | 5 +
source3/libsmb/clidgram.h | 1 +
source3/libsmb/clireadwrite.c | 13 +-
source3/libsmb/clispnego.c | 3 +
source3/libsmb/dsgetdcname.c | 2 +-
source3/libsmb/namequery.c | 199 +++++--
source3/locking/locking.c | 231 +++++---
source3/locking/proto.h | 10 +-
source3/modules/vfs_acl_common.c | 75 ++-
source3/modules/vfs_acl_xattr.c | 6 +-
source3/modules/vfs_aio_fork.c | 33 +-
source3/modules/vfs_aio_pthread.c | 625 ++++++++++++++++++++
source3/modules/vfs_streams_depot.c | 47 ++
source3/nmbd/nmbd.c | 3 +-
source3/param/loadparm.c | 12 +-
source3/passdb/lookup_sid.c | 17 +
source3/passdb/pdb_interface.c | 4 +-
source3/passdb/pdb_ldap.c | 1 +
source3/printing/load.c | 7 +-
source3/printing/nt_printing.c | 19 +-
source3/printing/printer_list.c | 2 +-
source3/registry/reg_api.c | 256 ++++++--
source3/registry/reg_backend_db.c | 85 +++-
source3/registry/reg_backend_smbconf.c | 11 +
source3/registry/reg_objects.c | 20 +-
source3/registry/reg_objects.h | 4 +-
source3/registry/reg_parse.c | 4 +-
source3/rpc_client/cli_lsarpc.c | 10 +-
source3/smbd/aio.c | 3 +-
source3/smbd/close.c | 36 +-
source3/smbd/conn.c | 2 +-
source3/smbd/file_access.c | 5 +-
source3/smbd/files.c | 89 +++-
source3/smbd/notify.c | 52 ++-
source3/smbd/nttrans.c | 392 +++++++------
source3/smbd/open.c | 6 +-
source3/smbd/password.c | 3 +-
source3/smbd/proto.h | 15 +-
source3/smbd/reply.c | 8 +-
source3/smbd/sec_ctx.c | 2 +-
source3/smbd/server.c | 47 +-
source3/smbd/server_exit.c | 15 +-
source3/smbd/server_reload.c | 44 +-
source3/smbd/service.c | 39 ++-
source3/smbd/smb2_break.c | 48 +-
source3/smbd/smb2_close.c | 28 +-
source3/smbd/smb2_create.c | 2 +-
source3/smbd/smb2_find.c | 35 +-
source3/smbd/smb2_flush.c | 35 +-
source3/smbd/smb2_getinfo.c | 41 +-
source3/smbd/smb2_ioctl.c | 184 ++-----
source3/smbd/smb2_lock.c | 51 +--
source3/smbd/smb2_notify.c | 35 +-
source3/smbd/smb2_read.c | 44 +-
source3/smbd/smb2_sesssetup.c | 8 +-
source3/smbd/smb2_setinfo.c | 41 +-
source3/smbd/smb2_write.c | 37 +-
source3/smbd/trans2.c | 1 +
source3/utils/net_ads.c | 2 +-
source3/utils/net_idmap_check.c | 6 +-
source3/winbindd/wb_lookupsids.c | 10 +-
source3/winbindd/winbindd.c | 17 +-
source3/winbindd/winbindd_ads.c | 24 +-
source3/winbindd/winbindd_cm.c | 5 +-
source3/winbindd/winbindd_group.c | 4 +-
source3/winbindd/winbindd_pam.c | 28 +-
source4/torture/rpc/spoolss.c | 1 +
136 files changed, 2929 insertions(+), 1246 deletions(-)
create mode 100644 docs-xml/manpages-3/vfs_aio_pthread.8.xml
delete mode 100644 examples/LDAP/samba-schema-netscapeds5.x
create mode 100644 examples/LDAP/samba-schema-netscapeds5.x.README
create mode 100644 source3/modules/vfs_aio_pthread.c
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 921fee2..f3d561d 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,6 +1,6 @@
=============================
Release Notes for Samba 3.6.6
- , 2012
+ June 25, 2012
=============================
@@ -8,13 +8,161 @@ This is is the latest stable release of Samba 3.6.
Major enhancements in Samba 3.6.6 include:
-o
+o Fix possible memory leaks in the Samba master process (bug #8970).
+o Fix uninitialized memory read in talloc_free().
+o Fix joining of XP Pro workstations to 3.6 DCs (bug #8373).
+
Changes since 3.6.5:
--------------------
+o Michael Adam <obnox at samba.org>
+ * BUG 8738: SMB2 server will not release unused shares.
+ * BUG 8749: Sign non guest sessions in SessionSetup.
+ * BUG 8921: Fix race writing registry values.
+
o Jeremy Allison <jra at samba.org>
+ * BUG 8373: Fix joining of XP Pro workstations to 3.6 DCs.
+ * BUG 8627: Fix crash bug in dns_create_probe when dns_create_update fails.
+ * BUG 8723: Add pthread-based aio VFS module.
+ * BUG 8784: When calculating the share security mask, take priviliges into
+ account for the connecting user.
+ * BUG 8811: sd_has_inheritable_components segfaults on an SD that
+ se_access_check accepts.
+ * BUG 8837: Fix crash in smbd when deleting directory and veto files are
+ enabled.
+ * BUG 8857: Setting traverse rights fails to enable directory traversal when
+ acl_xattr in use.
+ * BUG 8882: Broken processing of %U with vfs_full_audit when force user is
+ set.
+ * BUG 8897: Make winbind_krb5_locator not only returning one IP address.
+ * BUG 8910: resolve_ads() code can return zero addresses and miss valid
+ DC IP addresses.
+ * BUG 8922: smbclient's tarmode insists on listing excluded directories.
+ * BUG 8953: Winbind can hang as nbt_getdc() has no timeout.
+ * BUG 8957: Typo in pam_winbindd code MUST fix.
+ * BUG 8970: Fix possible memory leaks in the Samba master process.
+ * BUG 8971: cleanup_timeout_fn() is called too often, on exiting when an
+ smbd is idle.
+ * BUG 8972: Directory group write permission bit is set if unix extensions
+ are enabled.
+
+
+o Christian Ambach <ambi at samba.org>
+ * BUG 8406: Fix a return code check in Winbind.
+ * BUG 8807: Fix crash in dcerpc_lsa_lookup_sids_noalloc() crashes when
+ groups has more than 1000 groups.
+
+
+o Andrew Bartlett <abartlet at samba.org>
+ * BUG 8599: Only use SamLogonEx when we can get unencrypted session keys.
+ * BUG 8727: Fix smbclients with posix large reads.
+ * BUG 8943: Slow but responsive DC can lock up Winbind for > 10 minutes
+ at a time.
+
+
+o Björn Baumbach <bb at sernet.de>
+ * BUG 7564: Fix default name resolve order in the manpage.
+ * BUG 8554, 8612, 8748: Add new printers to registry.
+ * BUG 8789: Remove whitespace in example samba.ldif.
+
+
+o Alexander Bokovoy <ab at samba.org>
+ * BUG 8988: Avoid crash with MIT krb5 1.10.0 in gss_get_name_attribute().
+
+
+o Alejandro Escanero Blanco <aescanero at gmail.com>
+ * BUG 8798: The primary rid should be in the groups rid array.
+
+
+o Ira Cooper <samba at ira.wakeful.net>
+ * BUG 8729: Fix getpass regressions on Solaris/Illumos.
+ * BUG 8743: Fix configure.developer builds on Solaris.
+ * BUG 8910: Fix bad bugfix for bug #8910.
+ * BUG 8952: Fix negative SID->uid/gid cache handling.
+ * BUG 8995: Use fsp_persistent_id() as persistent_file_id part for SMB2.
+
+
+o David Disseldorp <ddiss at samba.org>
+ * BUG 8762: Fix crash in printer_list_set_printer().
+
+
+o Olaf Flebbe <o.flebbe at science-computing.de>
+ * BUG 8859: Fix assertion in reg_parse.
+
+
+o Björn Jacke <bj at sernet.de>
+ * BUG 8732: Fix compile of krb5 locator on Solaris.
+ * BUG 8869: Remove outdated netscape ds 5 schema file.
+ * BUG 8978: Remove dependency on automake for 'make everything'.
+
+
+o Steve Langasek <steve.langasek at ubuntu.com>
+ * BUG 8920: Fix null dereference in pdb_interface.
+
+
+o Volker Lendecke <vl at samba.org>
+ * Fix uninitialized memory read in talloc_free().
+ * BUG 8567: Fix segfault in dom_sid_compare.
+ * BUG 8733: Delete streams on directories (streams_depot).
+ * BUG 8760: Add SERVERID_UNIQUE_ID_NOT_TO_VERIFY.
+ * BUG 8836: Fix segfaults on "smbcontrol close-share" in aio_fork.
+ * BUG 8861: Fix a segfault with debug level 3 on Solaris.
+ * BUG 8904: Fix Winbind crash triggered by 'wbinfo --lookup-sids ""'.
+ * BUG 8998: Notify code can miss a ChDir.
+
+
+o Stefan Metzmacher <metze at samba.org>
+ * BUG 8139: Ignore SMBecho errors (the server may not support it).
+ * BUG 8527: db_ctdb_traverse fails to traverse records created within the
+ current transaction.
+ * BUG 8311: Winzip occasionally can not read files out of an open winzip
+ dialog.
+ * BUG 8739: Fill the sids array of the info in
+ wbcAuthUserInfo_to_netr_SamInfo3().
+ * BUG 8749: Sign non guest sessions in SessionSetup.
+ * BUG 8995: Use fsp_persistent_id() as persistent_file_id part for SMB2.
+
+
+o Matthieu Patou <mat at matws.net>
+ * BUG 8599: Set the can_do_validation6 also for trusted domain.
+ * BUG 8714: Catch with pid filename's change when config file is not
+ smb.conf.
+ * BUG 8734: Don't try to do clever thing if the username is not found while
+ authenticating through Winbind.
+ * BUG 8771: Winbind takes up to 20 minutes to change from DC 1 to DC 2.
+ * BUG 8975: Call dump_core_setup after command line option has been parsed.
+
+
+o SATOH Fumiyasu <fumiyas at osstech.co.jp>
+ * BUG 8826: Prepend '/' to filename argument (docs).
+
+
+o Andreas Schneider <asn at samba.org>
+ * BUG 8944 and 8567: Don't lookup the system user in pdb.
+
+
+o Richard Sharpe <realrichardsharpe at gmail.com>
+ * BUG 8768: Honor SeTakeOwnershipPrivilege when file opened with
+ SEC_STD_WRITE_OWNER.
+ * BUG 8797: Correctly handle DENY ACEs when privileges apply.
+ * BUG 8822: Fix building out-of-tree modules.
+ * BUG 8945: vfs_acl_common discards errors from writing to the underlying
+ storage.
+ * BUG 8970: Fix possible memory leaks in the Samba master process.
+
+
+o Simo Sorce <idra at samba.org>
+ * BUG 8915: Fix pam_winbind build against newer iniparser library.
+
+
+o Joseph Tam <jtam.home at gmail.com>
+ * BUG 8877: Syslog broken owing to mistyping of debug_settings.syslog.
+
+
+o Ralph Wuerthner <ralph.wuerthner at de.ibm.com>
+ * BUG 8845: Move print_backend_init() behind init_system_info().
######################################################################
diff --git a/docs-xml/Samba3-ByExample/SBE-MakingHappyUsers.xml b/docs-xml/Samba3-ByExample/SBE-MakingHappyUsers.xml
index 9ea5004..3cacc71 100644
--- a/docs-xml/Samba3-ByExample/SBE-MakingHappyUsers.xml
+++ b/docs-xml/Samba3-ByExample/SBE-MakingHappyUsers.xml
@@ -3881,7 +3881,7 @@ HKEY_LOCAL_MACHINE\Default\Software\Microsoft\Windows\
Note: If MS Outlook has been configured to use an IMAP account configuration there may be problems
following these instructions. Feedback from users suggests that where IMAP is used the PST
file is used to store rules and filters. When the PST store is relocated it appears to break
- MS Outlook's Send/Receive button. If anyone has sucessfully relocated PST files where IMAP is
+ MS Outlook's Send/Receive button. If anyone has successfully relocated PST files where IMAP is
used please email <literal>jht at samba.org</literal> with useful tips and suggestions so that
this warning can be removed or modified.
</para></step>
diff --git a/docs-xml/Samba3-Developers-Guide/unix-smb.xml b/docs-xml/Samba3-Developers-Guide/unix-smb.xml
index b700dfc..ae6bdcd 100644
--- a/docs-xml/Samba3-Developers-Guide/unix-smb.xml
+++ b/docs-xml/Samba3-Developers-Guide/unix-smb.xml
@@ -299,7 +299,7 @@ doesn't support them all.
Samba currently supports up to the "NT LM 0.12" protocol, which is the
one preferred by Win95 and WinNT3.5. Luckily this protocol level has a
"capabilities" field which specifies which super-duper new-fangled
-options the server suports. This helps to make the implementation of
+options the server supports. This helps to make the implementation of
this protocol level much easier.
</para>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-AccessControls.xml b/docs-xml/Samba3-HOWTO/TOSHARG-AccessControls.xml
index 0a50698..6096975 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-AccessControls.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-AccessControls.xml
@@ -1380,7 +1380,7 @@ mystic:/home/hannibal > rm filename
Samba has to deal with the complicated matter of handling the challenge of the Windows
ACL that implements <emphasis>inheritance</emphasis>, a concept not anticipated by POSIX
ACLs as implemented in UNIX file systems. Samba provides support for <emphasis>masks</emphasis>
- that permit normal ugo and ACLs functionality to be overrided. This further complicates
+ that permit normal ugo and ACLs functionality to be overridden. This further complicates
the way in which Windows ACLs must be implemented.
</para>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-TDBFiles.xml b/docs-xml/Samba3-HOWTO/TOSHARG-TDBFiles.xml
index 2a4bfb9..9bda64d 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-TDBFiles.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-TDBFiles.xml
@@ -24,7 +24,7 @@
<para>
<indexterm><primary>tdb</primary></indexterm>
-<indexterm><primary>currupted</primary></indexterm>
+<indexterm><primary>corrupted</primary></indexterm>
<indexterm><primary>backup</primary></indexterm>
<indexterm><primary>restore</primary></indexterm>
Those who package Samba for commercial distribution with operating systems and appliances would do well to take
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-VFS.xml b/docs-xml/Samba3-HOWTO/TOSHARG-VFS.xml
index 91e9712..933efb5 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-VFS.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-VFS.xml
@@ -916,7 +916,7 @@ max lru files entries = 100
lru file entry lifetime = 5
; exclude files from being scanned based on the MIME-type! Semi-colon
-; seperated list (default: empty list). Use this with care!
+; separated list (default: empty list). Use this with care!
exclude file types =
; socket name of clamd (default: /var/run/clamd). Setting will be ignored if
diff --git a/docs-xml/build/DTD/samba.entities b/docs-xml/build/DTD/samba.entities
index d204156..f5d8cd2 100644
--- a/docs-xml/build/DTD/samba.entities
+++ b/docs-xml/build/DTD/samba.entities
@@ -440,7 +440,7 @@ Try to use the credentials cached by winbind.
<!ENTITY stdarg.help '
<varlistentry>
-<term>-h|--help</term>
+<term>-?|--help</term>
<listitem><para>Print a summary of command line options.
</para></listitem>
</varlistentry>'>
diff --git a/docs-xml/manpages-3/idmap_nss.8.xml b/docs-xml/manpages-3/idmap_nss.8.xml
index 576eef6..565019c 100644
--- a/docs-xml/manpages-3/idmap_nss.8.xml
+++ b/docs-xml/manpages-3/idmap_nss.8.xml
@@ -20,7 +20,7 @@
<title>DESCRIPTION</title>
<para>The idmap_nss plugin provides a means to map Unix users and groups
- to Windows accounts and obseletes the "winbind trusted domains only"
+ to Windows accounts and obsoletes the "winbind trusted domains only"
smb.conf option. This provides a simple means of ensuring that the SID
for a Unix user named jsmith is reported as the one assigned to
DOMAIN\jsmith which is necessary for reporting ACLs on files and printers
diff --git a/docs-xml/manpages-3/libsmbclient.7.xml b/docs-xml/manpages-3/libsmbclient.7.xml
index 2e54aa0..277caf3 100644
--- a/docs-xml/manpages-3/libsmbclient.7.xml
+++ b/docs-xml/manpages-3/libsmbclient.7.xml
@@ -71,7 +71,7 @@
responsibility of the application that calls this library to set this to a sensible value. This
is a compile-time option. This value determines the maximum number of local master browsers to
query for the list of workgroups. In order to ensure that the list is complete for those present
- on the network, all master browsers must be querried. If there are a large number of workgroups
+ on the network, all master browsers must be queried. If there are a large number of workgroups
on the network, the time spent querying will be significant. For small networks (just a few
workgroups), it is suggested to set this value to 0, instructing libsmbclient to query all local
master browsers. In an environment that has many workgroups a more reasonable setting may be around 3.
diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml
index 5c16408..65f1272 100644
--- a/docs-xml/manpages-3/net.8.xml
+++ b/docs-xml/manpages-3/net.8.xml
@@ -2105,7 +2105,7 @@ Joins a computer into a domain. This command supports the following additional p
<listitem><para><replaceable>DOMAIN</replaceable> can be a NetBIOS domain name (also known as short domain name) or a DNS domain name for Active Directory Domains. As in Windows, it is also possible to control which Domain Controller to use. This can be achieved by appending the DC name using the \ separator character. Example: MYDOM\MYDC. The <replaceable>DOMAIN</replaceable> parameter cannot be NULL.</para></listitem>
-<listitem><para><replaceable>OU</replaceable> can be set to a RFC 1779 LDAP DN, like <emphasis>ou=mymachines,cn=Users,dc=example,dc=com</emphasis> in order to create the machine account in a non-default LDAP containter. This optional parameter is only supported when joining Active Directory Domains.</para></listitem>
+<listitem><para><replaceable>OU</replaceable> can be set to a RFC 1779 LDAP DN, like <emphasis>ou=mymachines,cn=Users,dc=example,dc=com</emphasis> in order to create the machine account in a non-default LDAP container. This optional parameter is only supported when joining Active Directory Domains.</para></listitem>
<listitem><para><replaceable>ACCOUNT</replaceable> defines a domain account that will be used to join the machine to the domain. This domain account needs to have sufficient privileges to join machines.</para></listitem>
diff --git a/docs-xml/manpages-3/ntlm_auth.1.xml b/docs-xml/manpages-3/ntlm_auth.1.xml
index 69264d7..dcf9b42 100644
--- a/docs-xml/manpages-3/ntlm_auth.1.xml
+++ b/docs-xml/manpages-3/ntlm_auth.1.xml
@@ -199,7 +199,7 @@
MSCHAPv2) generated in some way by both the server and
the client.
</para>
- <para><example>LANMAN-Challege: 0102030405060708</example></para>
+ <para><example>LANMAN-Challenge: 0102030405060708</example></para>
</listitem></varlistentry>
<varlistentry>
@@ -239,7 +239,7 @@
<varlistentry>
<term>Request-User-Session-Key</term>
- <listitem><para>Apon sucessful authenticaiton, return
+ <listitem><para>Upon successful authenticaiton, return
the user session key associated with the login.
</para>
<para><example>Request-User-Session-Key: Yes</example></para>
@@ -248,14 +248,14 @@
<varlistentry>
<term>Request-LanMan-Session-Key</term>
- <listitem><para>Apon sucessful authenticaiton, return
+ <listitem><para>Upon successful authenticaiton, return
the LANMAN session key associated with the login.
</para>
<para><example>Request-LanMan-Session-Key: Yes</example></para>
</listitem></varlistentry>
- <para><warning>Implementors should take care to base64 encode
+ <para><warning>Implementers should take care to base64 encode
any data (such as usernames/passwords) that may contain malicous user data, such as
a newline. They may also need to decode strings from
the helper, which likewise may have been base64 encoded.</warning></para>
@@ -319,7 +319,7 @@
<varlistentry>
<term>--request-lm-key</term>
- <listitem><para>Retreive LM session key</para></listitem>
+ <listitem><para>Retrieve LM session key</para></listitem>
</varlistentry>
<varlistentry>
@@ -380,7 +380,7 @@ auth_param basic program ntlm_auth --helper-protocol=squid-2.5-basic --require-m
<title>TROUBLESHOOTING</title>
<para>If you're experiencing problems with authenticating Internet Explorer running
- under MS Windows 9X or Millenium Edition against ntlm_auth's NTLMSSP authentication
+ under MS Windows 9X or Millennium Edition against ntlm_auth's NTLMSSP authentication
helper (--helper-protocol=squid-2.5-ntlmssp), then please read
<ulink url="http://support.microsoft.com/support/kb/articles/Q239/8/69.ASP">
the Microsoft Knowledge Base article #239869 and follow instructions described there</ulink>.
diff --git a/docs-xml/manpages-3/pdbedit.8.xml b/docs-xml/manpages-3/pdbedit.8.xml
index fa8cabc..1d0752e 100644
--- a/docs-xml/manpages-3/pdbedit.8.xml
+++ b/docs-xml/manpages-3/pdbedit.8.xml
@@ -72,7 +72,7 @@
without changing the tool).</para>
<para>There are five main ways to use pdbedit: adding a user account,
- removing a user account, modifing a user account, listing user
+ removing a user account, modifying a user account, listing user
accounts, importing users accounts.</para>
</refsect1>
@@ -162,7 +162,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
<varlistentry>
<term>-f|--fullname fullname</term>
<listitem><para>This option can be used while adding or
- modifing a user account. It will specify the user's full
+ modifying a user account. It will specify the user's full
name. </para>
<para>Example: <command>-f "Simo Sorce"</command></para>
@@ -172,7 +172,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
<varlistentry>
<term>-h|--homedir homedir</term>
<listitem><para>This option can be used while adding or
- modifing a user account. It will specify the user's home
+ modifying a user account. It will specify the user's home
directory network path.</para>
<para>Example: <command>-h "\\\\BERSERKER\\sorce"</command>
@@ -183,7 +183,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
<varlistentry>
<term>-D|--drive drive</term>
<listitem><para>This option can be used while adding or
- modifing a user account. It will specify the windows drive
+ modifying a user account. It will specify the windows drive
letter to be used to map the home directory.</para>
<para>Example: <command>-D "H:"</command>
@@ -195,7 +195,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
<varlistentry>
<term>-S|--script script</term>
<listitem><para>This option can be used while adding or
- modifing a user account. It will specify the user's logon
+ modifying a user account. It will specify the user's logon
script path.</para>
<para>Example: <command>-S "\\\\BERSERKER\\netlogon\\sorce.bat"</command>
@@ -207,7 +207,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
<varlistentry>
<term>-p|--profile profile</term>
<listitem><para>This option can be used while adding or
- modifing a user account. It will specify the user's profile
+ modifying a user account. It will specify the user's profile
directory.</para>
<para>Example: <command>-p "\\\\BERSERKER\\netlogon"</command>
@@ -447,7 +447,7 @@ account policy value for bad lockout attempt is now 3
<varlistentry>
<term>-N|--account-desc description</term>
<listitem><para>This option can be used while adding or
- modifing a user account. It will specify the user's description
+ modifying a user account. It will specify the user's description
field.</para>
<para>Example: <command>-N "test description"</command>
@@ -458,7 +458,7 @@ account policy value for bad lockout attempt is now 3
<varlistentry>
<term>-Z|--logon-hours-reset</term>
<listitem><para>This option can be used while adding or
- modifing a user account. It will reset the user's allowed logon
+ modifying a user account. It will reset the user's allowed logon
hours. A user may login at any time afterwards.</para>
<para>Example: <command>-Z</command>
@@ -469,7 +469,7 @@ account policy value for bad lockout attempt is now 3
<varlistentry>
<term>-z|--bad-password-count-reset</term>
<listitem><para>This option can be used while adding or
- modifing a user account. It will reset the stored bad login
+ modifying a user account. It will reset the stored bad login
counter from a specified user.</para>
<para>Example: <command>-z</command>
@@ -490,7 +490,7 @@ account policy value for bad lockout attempt is now 3
<varlistentry>
<term>-I|--domain</term>
<listitem><para>This option can be used while adding or
- modifing a user account. It will specify the user's domain field.</para>
+ modifying a user account. It will specify the user's domain field.</para>
<para>Example: <command>-I "MYDOMAIN"</command>
</para>
diff --git a/docs-xml/manpages-3/smbcacls.1.xml b/docs-xml/manpages-3/smbcacls.1.xml
index 756000a..8674ecf 100644
--- a/docs-xml/manpages-3/smbcacls.1.xml
+++ b/docs-xml/manpages-3/smbcacls.1.xml
@@ -20,7 +20,7 @@
<cmdsynopsis>
<command>smbcacls</command>
<arg choice="req">//server/share</arg>
- <arg choice="req">filename</arg>
+ <arg choice="req">/filename</arg>
<arg choice="opt">-D|--delete acls</arg>
<arg choice="opt">-M|--modify acls</arg>
<arg choice="opt">-a|--add acls</arg>
diff --git a/docs-xml/manpages-3/smbclient.1.xml b/docs-xml/manpages-3/smbclient.1.xml
index ae11e8a..dfeb6c5 100644
--- a/docs-xml/manpages-3/smbclient.1.xml
+++ b/docs-xml/manpages-3/smbclient.1.xml
@@ -322,7 +322,7 @@
server support the UNIX extensions. Request that the connection be
encrypted. This is new for Samba 3.2 and will only work with Samba
3.2 or above servers. Negotiates SMB encryption using GSSAPI. Uses
- the given credentials for the encryption negotiaion (either kerberos
+ the given credentials for the encryption negotiation (either kerberos
or NTLMv1/v2 if given domain/username/password triple. Fails the
connection if encryption cannot be negotiated.
</para></listitem>
@@ -428,7 +428,7 @@
<para>Restore from tar file <filename>backup.tar</filename> into myshare on mypc
(no password on share). </para>
- <para><command>smbclient //mypc/yshare "" -N -Tx backup.tar
+ <para><command>smbclient //mypc/myshare "" -N -Tx backup.tar
</command></para>
<para>Restore everything except <filename>users/docs</filename>
@@ -634,7 +634,7 @@
<varlistentry>
<term>du <filename></term>
- <listitem><para>Does a directory listing and then prints out the current disk useage and free space on a share.
+ <listitem><para>Does a directory listing and then prints out the current disk usage and free space on a share.
</para></listitem>
</varlistentry>
diff --git a/docs-xml/manpages-3/smbcontrol.1.xml b/docs-xml/manpages-3/smbcontrol.1.xml
index 31c3537..6ffec13 100644
--- a/docs-xml/manpages-3/smbcontrol.1.xml
+++ b/docs-xml/manpages-3/smbcontrol.1.xml
@@ -214,7 +214,7 @@
<para>
Note that this message only sends notification that an
- event has occured. It doesn't actually cause the
+ event has occurred. It doesn't actually cause the
event to happen.
</para>
--
Samba Shared Repository
More information about the samba-cvs
mailing list