[SCM] Samba Shared Repository - branch v3-2-stable updated -
release-3-2-5-188-gd652e43
Karolin Seeger
kseeger at samba.org
Tue Dec 9 11:08:49 GMT 2008
The branch, v3-2-stable has been updated
via d652e431bde55ed0b44822bda4ab782b993f6d14 (commit)
via 2b06400f700e6950d8f96551f869399fb9cb9e9f (commit)
via bbc8a39cb2a369d541ae1f473ad77c8b0486f015 (commit)
via 8e5266cf7be66909f78c67f184c32582158f8604 (commit)
via ea5666ac27fed563dd78f8b0131dca0661883b3f (commit)
via 3fb43a442cd77c06d8ba58cbd464e4ed100f8dec (commit)
via 2766a90f59eb1a63e5dbaa16a2103ca6d4510cda (commit)
via 41a935186b94f649ac536e481d568d82f69a04cf (commit)
via 60f24e229c3ce3e75c71268d68ddbc43a22bc492 (commit)
via 230f3a8e83314326bf6bc9cd23b66a532733f027 (commit)
via dc03130023287b218ddf07a090a92963171c39e7 (commit)
via c16fc1c2ca533dfffc3ac9354b5bf6fcaf368d4c (commit)
via 8ff4806838522d4d0bf678f00453ccfab2777cce (commit)
via 3122c71fd6b438d8bd9fb4f9eeaacc434c742706 (commit)
via 2521015a1357b10ea4ab62aaa00f615e0b585abf (commit)
via 76a18c9205230d1f5c7b1675da0e3b1f494f06e8 (commit)
via bf1da3a493473e52e4f1cafe111197c70fd0866f (commit)
via ef4fa1555f00ddd4586e95b59558530a71dabe5d (commit)
via 22e1b7ffb2e8e4938c16b7ce420c6e4616d7adb1 (commit)
via 2c3753b92b8d4efe1b7a82bb6dd0750a40a3876d (commit)
via 916898fba387d3b195a5b285b7e88425b21795bd (commit)
via 31c809d162b32e25f80e92d26873be5547925768 (commit)
via ac7e8afb3595dd21b8e5d47102fd841700269512 (commit)
via 6ab7163b0a5116c20c5d0a3bbfd4cb3afcd00584 (commit)
via e52e3a1acf2ff54aad40a01148cb68ab509047a8 (commit)
via 66882f0359316e92bfdbcff4ce6784c268bab37f (commit)
via 3a1cc997aad8d0be9cc06a37cd400a0e687a9ac7 (commit)
via b762cddcae401df5d02f8eb16dd5b620210473ef (commit)
via 7b19b685f108ac6866430a685949d7e7e2b7e1f4 (commit)
via cd6b411fa7ec9d853ef1c163ad02b459bedcc4c2 (commit)
via cc4df78568ce162c886fe55e49a797cbcf0286d2 (commit)
via 21d5882da426c1d6b6b2542699f97b9d2b834e54 (commit)
via dbcca6b3f0281dfaa9978e7a65e9a9c1e0c9f601 (commit)
via 3fa67c689d869dbea7ce6a451c65c204c4c640a1 (commit)
via 61360931eeb8357c7964e1b855ca9ea6be5a9f9f (commit)
via 2583ed6da1f25e312809e0ac41d7e13eda7e5d13 (commit)
via 1d422daf90641f84564d69116312849fe022152f (commit)
via 08b9173539f09ce758b914e9ae57b73d681d9291 (commit)
via d25d9c90e8effaad3b38a25c91eae218be35669a (commit)
via 88286e5c9920fb460ae6ab10a35646df2cca7909 (commit)
via 4b075982a6a946dc605878b5214f253227becf56 (commit)
via b69e789b63129146d320ff6c1fa8f7c0f6745907 (commit)
via c83a008f9f581e4f265e63c6cb8adc2e049b4137 (commit)
via 8340f192e616512f00f5472b35a4f48badd3fb45 (commit)
via e05f45acb9e717cf2551b0894b8636ef60a20642 (commit)
via 0e1df7dfd84046da8e081e0e44cf68969118e662 (commit)
via 352794b1af16623861e95db7e4a38c4f1493a6d8 (commit)
via c7cf630c8f0b19d8fa9fb6405c65585192db81e4 (commit)
via a80a87be488b2792dc4cf646378c69deb2d3fd83 (commit)
via 7bfab448607d3d97643cf178516c81840e1f8127 (commit)
via a733f2e93bd74b8b03e93fddb589f1b9ab7c48cc (commit)
via c2c5619f98c4a9bdd8315be958bb2f3acf28bab7 (commit)
via 5a6bf238cdd25cc419eebc01f1c77782d46528e7 (commit)
via 52e8cb875ca632135b91eda74bca30e0d531d9f9 (commit)
via d2975dd5b01e11e87797584e634e238513061c59 (commit)
via 04696b70758b0cb650345a5a2da97b42f4640e12 (commit)
via 00b8f2d2fa11166b257daf7ce504affc08c056e3 (commit)
via 4f11a0c0b375085f942945d08b7c787f07eaf780 (commit)
via 85ccc328a4fefeb1f2b0967d9e487ae83a10b860 (commit)
via b496ea66455cc637b34a7e54005fffcac203bb9c (commit)
via 573e62e3a74f9c70d37802b45731ac628b69f76f (commit)
via c56eb5fbcb69da4cecd08753f71d827a0b221f4e (commit)
via fa9430c5674acd176e0a2887339f5514ce0ba8de (commit)
via f4f41b03b7a3e944fa2c8e31e0c003b8502a86af (commit)
via fd9ddf0970a30e37c9e5c75491d717438d97c5d5 (commit)
via 66677920d6189ef8deae080d959e25c01a727339 (commit)
via 288c03db4c463fc5d007fe999515df2be07a4b49 (commit)
via da611fafdf0f408ff0d20bf0e5138ebfa1722527 (commit)
via 9612e97ca5e571e1a203f78efb6df912b86054a3 (commit)
via 7dc71e636ba657518cbce4d2230523023a144e07 (commit)
via b7ec2e35f3b0c22e2e6281ab761b3279637c38fc (commit)
via 462ec83bbffdad4c855aea76b7fa005beafd5e06 (commit)
via 8059b418eaf8d90233f2115c64d40db7cec371c3 (commit)
via 69438d9f2ab00c546b264f62f4f8d346b10280e3 (commit)
via e399ea4d1581875e9928f9a61f624fe3ce4d4cb8 (commit)
via 87a37d4adfbcf298f5666fcaad4cc498609158e7 (commit)
via 2808212e11058ef79a4e722f11ae71c893ed21ff (commit)
via 935d926ea12a1bf216f4718038c4020b9a570aa4 (commit)
via 16eeb16ac6e5c264c7665ecf458bcddae18fd57e (commit)
via 4d988d0c9f22dda706ee1802985830ce4999f4d5 (commit)
via 4ec9af7ab637912e2c16dc779836b3455c4653b3 (commit)
via 7ba051a8d0e94b2eadf8ab8fbd3792be8b7189d8 (commit)
via 6769ca13c078417a2d8c0183102f6bacb01e497b (commit)
via ad86b4c5b062882b9094e97e41b84266a4956478 (commit)
via 22e928fec2cf2ec26b7eb0e2bb3851519760c876 (commit)
via 72f883cea0b4b69f639d30d79aceef34f0ec4fe4 (commit)
via 1e2f5c4465b76f3cb86b001c9e3a7212c65835d7 (commit)
via ac32a6c391d784551542fecb98c3314deef383dd (commit)
via 447382ec1809555fd2cc3f6395a2a9873352b133 (commit)
via fe3fb90e63c40fd496d9b6c18c4d951616458de0 (commit)
via f32809939f527bb3de0ff6ea7a5e512dcdbb7417 (commit)
via ca6dda446e64e49e1d29c5e695a430bee9b04844 (commit)
via 503623568c5159c10e8e58e3a69ac65b8d80fa69 (commit)
via 8a041f7a101608f3de8ce0a0b41bdc3d8e8a9547 (commit)
via 74770e30cc4168fbf7fedf1a01532aac81dcde65 (commit)
via 7b00730704aed05e1ee689809c9ac4ecc2208403 (commit)
via 1466ba45f2f79966efbd19513bc533e093313a0b (commit)
via 1aeeae2627cae270b7ebc98da73a835647983b8c (commit)
via 34c7678cb5c726f0a4c158d5ac8463bf20667793 (commit)
via 2b9c5d5aac8f1b7f704eeee9a96e80a17c56beb8 (commit)
via 0195373b04dc5f7ba416322b3120f8008adb4298 (commit)
via 21c05fcec501ebeca32b7b0f44e390c472a9b2fb (commit)
via f8e5dc1a7506494a3e04855d7ec1d9638b2e005d (commit)
via 3b6eb50b5cfb3959031bd3432e6eea6b53bfa8bf (commit)
via 87ce7e82dc6b754962341e84bf89a4a8e6da9221 (commit)
via 183a5e5f87fa3d4cec45d714fc6295f68ea80bf9 (commit)
via 4eda1958a62b283b2a058aaf053ebda9a0036957 (commit)
via db6dd479de1ee8d0118e785c4b5cc48502f466ea (commit)
via bb3e189c67b10aaae66993ced1c214c7a63d026a (commit)
via db6b38422962011155c911e275239cac968784cd (commit)
via 0a81d7d923d9e680ec2117103cb50c9cf0a8ed9f (commit)
via ade088e89b62e76096c9cd8b2f47ce3fd349c754 (commit)
via 7a3c3bf36f8c88a2a091325c558af640ccaa2132 (commit)
via 157ebfd5c4a8e56a5760b5e30de4ffcfea81270c (commit)
via 717d7af3eaa8fe8f890743dbda696e303dcf0db7 (commit)
via d362e859f06e0dffc84909d03c50f1c8f3e08efa (commit)
via 1c2b4db42cc75f2f2603f0d96098cfea12d2e0ca (commit)
via 32932b40c0ad95711200af4287d581ddbcfe2182 (commit)
via cbdd3767854e72f64aa5385176a246cc49f9f389 (commit)
via b40fdb68461d8e961f6c009ce72381415defa3da (commit)
via 2c9a114a8481dc3462faa3bbdcb7fe64b74afadc (commit)
via 607f11f949ffc4a98262e4e471c4f743b18e8cf7 (commit)
via d9d5bf5031374d1a410cb498c5f85aa58dcd5006 (commit)
via c515917bad2540c1f909ce36e8a16a451052bf51 (commit)
from a4f1d30bfe206b43883ed7af5ed1a8607318ce53 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable
- Log -----------------------------------------------------------------
commit d652e431bde55ed0b44822bda4ab782b993f6d14
Author: Jeremy Allison <jra at samba.org>
Date: Mon Dec 8 14:02:59 2008 -0800
Fix bug #5953 - smbclient crashes: cli_list_new segmentation fault.
Karolin: must be in 3.2-stable. Thanks,
Jeremy.
(cherry picked from commit 00af69227dbdd6dfd3776b5cb52f479c9c85b697)
commit 2b06400f700e6950d8f96551f869399fb9cb9e9f
Author: Dan Sledz <dsledz at isilon.com>
Date: Fri Dec 5 17:29:38 2008 -0800
Fix logging to syslog
(cherry picked from commit 66c08857fbf78a24e7770e1d1bf8938bb938b271)
commit bbc8a39cb2a369d541ae1f473ad77c8b0486f015
Author: Tomasz Krasuski <kr0tki at poczta.onet.pl>
Date: Fri Dec 5 16:30:55 2008 -0800
Fix bug #5928 - Option --version in testparm does not work.
(cherry picked from commit 635373512634a05d65b009e4ec3669a227b2b94d)
commit 8e5266cf7be66909f78c67f184c32582158f8604
Author: Yasuma Takeda <yasuma at osstech.co.jp>
Date: Fri Dec 5 13:38:06 2008 -0800
Fix bug #5944 - nmbd does not boot if socket adress = "" is defined in smb.conf
(cherry picked from commit 0e3d643712ed315bacc91db56985358e20ce9913)
commit ea5666ac27fed563dd78f8b0131dca0661883b3f
Author: Volker Lendecke <Volker.Lendecke at SerNet.DE>
Date: Fri Dec 5 13:21:19 2008 -0800
Fix for crash bug freeing a non-malloc'ed buffer if the client sends a non-encrypted packet with the crypto state set.
(cherry picked from commit c2012ac787c05361c7fa9589bec4f7e5c6482a28)
commit 3fb43a442cd77c06d8ba58cbd464e4ed100f8dec
Author: Jeremy Allison <jra at samba.org>
Date: Thu Dec 4 15:33:27 2008 -0800
Fix bug #5937 - filenames with "*" char hide other files
Jeremy.
(cherry picked from commit 601c7eabfdb3d2725849669dda58de6db22d9b8f)
commit 2766a90f59eb1a63e5dbaa16a2103ca6d4510cda
Author: Henning Henkel <henning.henkel at fh-furtwangen.de>
Date: Thu Dec 4 13:43:59 2008 -0800
Fix bug #5929 - vfs_prealloc does not build with option --with-cluster-support and GPFS
(cherry picked from commit a1e4637922a565278cceac7b2fe95f82ad049f4a)
commit 41a935186b94f649ac536e481d568d82f69a04cf
Author: Jeremy Allison <jra at samba.org>
Date: Thu Dec 4 10:23:06 2008 -0800
Fix bug #1254 - write list not working under share-level security
Jeremy.
(cherry picked from commit d2b7d9d29feab263bf736a88e5819203cbc8a165)
commit 60f24e229c3ce3e75c71268d68ddbc43a22bc492
Author: Michael Adam <obnox at samba.org>
Date: Thu Dec 4 15:01:46 2008 +0100
winbindd: fix more horrible brace mis-indentations in winbindd_group
Sorry, but I can't bear this.
And while my vim is smart enough to cope with this,
it confuses _me_, and I have seen an emacs confused as well.
(Which comes as no surprise, almost human as it is...)
Michael
(cherry picked from commit addbddf90a4935f7fda8ed4acbf5a4574d7fc92b)
commit 230f3a8e83314326bf6bc9cd23b66a532733f027
Author: Michael Adam <obnox at samba.org>
Date: Thu Dec 4 14:30:52 2008 +0100
winbindd: fix more misindentations of top level braces in winbindd_group
Michael
(cherry picked from commit 21dedb62d866bb0a2ae808c8d5a411c7f0fb8604)
commit dc03130023287b218ddf07a090a92963171c39e7
Author: Michael Adam <obnox at samba.org>
Date: Thu Dec 4 14:29:01 2008 +0100
winbindd: fix horrible mis-indentation of toplvl braces in getgrsid_sid2gid_recv
to make code more readable
Michael
(cherry picked from commit 2deb1272ef7d3edd910988e696f5556bcfcdbe1f)
commit c16fc1c2ca533dfffc3ac9354b5bf6fcaf368d4c
Author: Michael Adam <obnox at samba.org>
Date: Wed Dec 3 16:38:55 2008 +0100
winbindd: don't open a new dc connection in winbindd_getpwnam (main winbindd)
This is just to find the corresponding domain struct.
Actual connection is handled by the domain child.
Michael
(cherry picked from commit 284b3e50435d4450008031e00b7290a1970a0cc4)
commit 8ff4806838522d4d0bf678f00453ccfab2777cce
Author: Michael Adam <obnox at samba.org>
Date: Wed Dec 3 15:59:17 2008 +0100
winbindd: don't open a new dc connection in winbindd_getgrnam (main winbindd)
This is just to find the corresponding domain struct.
Actual connection is handled by the domain child.
Michael
(cherry picked from commit b8e94c56a68cb3525682e24de6078608a1146240)
commit 3122c71fd6b438d8bd9fb4f9eeaacc434c742706
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Dec 4 12:26:03 2008 +0100
s3:net: fix password set of 'net rpc trustdom add'
metze
(cherry-picked from commit 2b8f3e253d3a56aac996287f5ce265d0c915b3c8)
(cherry picked from commit e1e76f19cf9c72abe4086965846b2d438cfbdd00)
(cherry picked from commit 05fbd5f87cb39cffe0acc5c3132e13f2d471edf2)
commit 2521015a1357b10ea4ab62aaa00f615e0b585abf
Author: Tim Prouty <tprouty at samba.org>
Date: Wed Dec 3 10:37:03 2008 -0800
Change sockaddr util function names for consistency and to eliminate name conflicts
(cherry picked from commit 10dd8a54ea7ea2cf86de5e20a62912298e0c4acc)
commit 76a18c9205230d1f5c7b1675da0e3b1f494f06e8
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Dec 3 09:07:00 2008 +0100
libwbclient: avoid usage talloc_init() in library code
talloc_init() is a compat function for the old samba3
non-hierachical talloc implementation. It enables
the talloc null tracking which should never be done
by library code.
metze
(cherry picked from commit afa0d6b0b14e0ef2293bd8468ffc1d6330abdb5b)
(cherry picked from commit 37a92ed0eb2c8cf7f3eac1d90ba5300cbce45186)
(cherry picked from commit f84cbb18a018d4c28fb98f00a38a7b7df48768c0)
commit bf1da3a493473e52e4f1cafe111197c70fd0866f
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Dec 2 20:50:02 2008 +0100
docs: Add default value for "writeable" to man smb.conf.
Karolin
(cherry picked from commit c09e04ac83365333605b7b1db3d07ccfd451a667)
(cherry picked from commit 70c581586ea02fbff4c5dde0ec002b22d472dfc5)
(cherry picked from commit 1ba197a3054c6d997ceca6f124039d3cabf00289)
commit ef4fa1555f00ddd4586e95b59558530a71dabe5d
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 14:36:57 2008 -0800
s3:selftest: test the streams_depot module as it passes make test
The streams_xattr module only passes sometimes on my laptop.
metze
(cherry picked from commit 23473f3f000309ae8fa1481b4ccc97e5ee0adca1)
commit 22e1b7ffb2e8e4938c16b7ce420c6e4616d7adb1
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 14:28:13 2008 -0800
s3:smbd: close the low level fd of the base_fsp, if the file was created
metze
(cherry picked from commit 34bd33631ba561cc9fb8fccf533cc3ae21cb670e)
commit 2c3753b92b8d4efe1b7a82bb6dd0750a40a3876d
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 14:26:36 2008 -0800
s3:streams_xattr: fstat should do a stat on the base file
The behavior of stat and fstat should be the same.
metze
(cherry picked from commit 84e8fcd6703d57678c1ac7e5df67c03a626c0e6f)
commit 916898fba387d3b195a5b285b7e88425b21795bd
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 14:25:04 2008 -0800
s3:streams_xattr: recheck fsp->fsp_name after a rename
metze
(cherry picked from commit 67788371cef51009295d1f85daf7f0328225f1f9)
commit 31c809d162b32e25f80e92d26873be5547925768
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 14:23:16 2008 -0800
s3:smbd: give the correct error when trying to replace a stream
metze
(cherry picked from commit c8b021ee740e67973b1d37eceadf7bab6c413cdd)
commit ac7e8afb3595dd21b8e5d47102fd841700269512
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 14:21:43 2008 -0800
s3:vfs: fix FCHMOD_ACL macros
metze
(cherry picked from commit 144cccebe51d726507a299880ea9a21540f44e44)
commit 6ab7163b0a5116c20c5d0a3bbfd4cb3afcd00584
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 14:19:55 2008 -0800
s3:streams_depot: add an option to disable the xattr checks
streams_depot:check_valid=no is useful when the filesystem
has no xattr support and files are only published via samba.
metze
(cherry picked from commit f68f2b1f841daabebc7178e7d90891cfe4be6cf4)
commit e52e3a1acf2ff54aad40a01148cb68ab509047a8
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 14:11:17 2008 -0800
s3:streams_depot: fix valgrind bug lp_parm_const_string() doesn't talloc the default value
metze
(cherry picked from commit f609404489a37b80e2f7f10d0de7633766d159a9)
commit 66882f0359316e92bfdbcff4ce6784c268bab37f
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 14:09:45 2008 -0800
s3:streams_depot: add support for stream renames
metze
(cherry picked from commit 2babe18de37e1cf283a0a29e2df0b0f74744cea2)
commit 3a1cc997aad8d0be9cc06a37cd400a0e687a9ac7
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 13:58:14 2008 -0800
s3:streams_depot: map 'file::$DATA' to just 'file'
metze
(cherry picked from commit 254ab3e074d51ad390aacd5a64e8c9e4f752dd7d)
commit b762cddcae401df5d02f8eb16dd5b620210473ef
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 13:54:19 2008 -0800
s3:streams_xattr: add support for renaming streams
metze
(cherry picked from commit 8a60128ff7960f2f19055f8e320d1d58fd87c84f)
commit 7b19b685f108ac6866430a685949d7e7e2b7e1f4
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 13:51:59 2008 -0800
s3:smbd: only try and fallback to open a directory if it's not a stream open
metze
(cherry picked from commit b095db2f9db084798a8e6d2bc44a6215f4038658)
commit cd6b411fa7ec9d853ef1c163ad02b459bedcc4c2
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 13:44:43 2008 -0800
s3:smbd: write times should be set on the base file instead of the stream name
metze
(cherry picked from commit 8cb8ab81678e8fee570f228c3851c384abf54054)
commit cc4df78568ce162c886fe55e49a797cbcf0286d2
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 13:34:38 2008 -0800
s3:smbd: return DELETE_PENDING on path based operations on streams, when the main file was deleted.
metze
(cherry picked from commit 0ed6d1f02a82c6f5e32a4941f153b601a5256921)
commit 21d5882da426c1d6b6b2542699f97b9d2b834e54
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 13:31:06 2008 -0800
s3:smbd: construct the correct newname for stream renames
The Windows Explorer creates temporary streams and renames
them later via SFILEINFO_RENAME_INFO. The newname comes
in as ":Stream:$DATA".
metze
(cherry picked from commit 9859f7bcd5a36bab4b86f7c1f7efe6e21614a18e)
commit dbcca6b3f0281dfaa9978e7a65e9a9c1e0c9f601
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 13:27:30 2008 -0800
s3:smbd: wildcard characters are allowed in stream names
We only check the filename of the basefile now.
metze
(cherry picked from commit 1ad249d10bc4a9ed61c1f712e6ccc35e6ec7ba06)
commit 3fa67c689d869dbea7ce6a451c65c204c4c640a1
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 13:20:56 2008 -0800
s3:smbd: correctly verify stream names to pass RAW-STREAMS
metze
(cherry picked from commit 3a5d85ca7ca54f7ab5e742c6026b528fcc94bae5)
commit 61360931eeb8357c7964e1b855ca9ea6be5a9f9f
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 12:59:25 2008 -0800
s3:smbd: '|' isn't allowed in windows filenames
metze
(cherry picked from commit 7d86c371f4613287e5e7461db37ee5db86c2a5aa)
commit 2583ed6da1f25e312809e0ac41d7e13eda7e5d13
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 1 17:35:19 2008 +0100
Fix a debug message, append the correct \n
(cherry picked from commit 263c1ca96bd68dced4577a2504073e1140fa26a1)
(cherry picked from commit 0f2e2451a5d7eac917d8a874032c2366dd8aaa12)
commit 1d422daf90641f84564d69116312849fe022152f
Author: Michael Adam <obnox at samba.org>
Date: Mon Dec 1 06:17:43 2008 +0100
vfs_tsmsm: fix potential segfault (freeing uninitialized buffer)
Michael
(cherry picked from commit 75646900fc9327a1ff3353be4a4e52a429055a91)
commit 08b9173539f09ce758b914e9ae57b73d681d9291
Author: Andreas Schneider <anschneider at suse.de>
Date: Wed Nov 26 13:19:03 2008 -0800
Fix circular dependency error with autoconf 2.6.3.
Signed-off-by: Andreas Schneider <anschneider at suse.de>
(cherry picked from commit ca172884bb9f64980d46d3e2cecd6189075cc983)
commit d25d9c90e8effaad3b38a25c91eae218be35669a
Author: Jeremy Allison <jra at samba.org>
Date: Tue Nov 25 15:55:46 2008 -0800
Fix bug #5914 - Build failure: redefinition of struct name_list
Jeremy.
(cherry picked from commit 57e2769b34f3e156af734304e0c342a8cd1821e2)
commit 88286e5c9920fb460ae6ab10a35646df2cca7909
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 25 12:19:35 2008 +0100
s3-samr: fix _samr_LookupNames return code.
Guenther
(cherry picked from commit dc7c2d63b3ce142959aa863f000fa9140de99eb0)
(cherry picked from commit e03d5d41184374f89d780725468227d546288be3)
commit 4b075982a6a946dc605878b5214f253227becf56
Author: Michael Adam <obnox at samba.org>
Date: Tue Nov 25 15:23:31 2008 +0100
zfsacl: return is not a function.
Michael
(cherry picked from commit 6017b3095b0eb0e5b855d5bf693c99645ff229b1)
commit b69e789b63129146d320ff6c1fa8f7c0f6745907
Author: Nils Goroll <nils.goroll at hamburg.de>
Date: Mon Nov 17 01:06:28 2008 +0100
zfsacl: Prevent calling POSIX ACL vfs methods on zfs share.
This is a proposed fix for Bugs #5135 and #5446.
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 4b64ef5ea9554992eddba85a203cbe9397f8e839)
commit c83a008f9f581e4f265e63c6cb8adc2e049b4137
Author: Dan Sledz <dsledz at isilon.com>
Date: Sun Nov 16 17:40:03 2008 -0800
[PATCH] Allow SYSLOG_FACILITY to be modified with a new configure option called --with-syslog-facility
(cherry picked from commit 372967099ed032832cbc5aa107eeb92949b3c139)
commit 8340f192e616512f00f5472b35a4f48badd3fb45
Author: Jeremy Allison <jra at samba.org>
Date: Mon Nov 24 15:29:17 2008 -0800
Fix bug #5873 - ACL inheritance cannot be broken. This regresses #4308, but that will have to
be fixed another way.
Jeremy.
(cherry picked from commit dbc9acf637397766fa663358424af5342c628d5e)
commit e05f45acb9e717cf2551b0894b8636ef60a20642
Author: Mathias Dietz <MDIETZ at de.ibm.com>
Date: Wed Nov 12 14:32:45 2008 +0100
Search for gpfs functions in both libgpfs_gpl.so an libgpfs.so
As of GPFS 3.2.1 PTF8 libgpfs will be available as GPL, so we don't need the
special libgpfs_gpl lib anymore. For backwards compatibility with pre-PTF8 GPFS
installations, still look there.
(cherry picked from commit 61468186cece7370576a2d13992f9a523067e4be)
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 93dd57627795b92b3d3f723a105271aead395dd1)
commit 0e1df7dfd84046da8e081e0e44cf68969118e662
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Nov 24 15:07:56 2008 +0100
libads/ldap.c: return an error instead of crashing when no realm is given
The bug was triggered by "net ads info -S 127.8.7.6" (where 127.8.7.6 doesn't exist)
and "disable netbios = yes".
metze
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit e2a60d2e1fd7455f08e73f8d1c513ca240c0f0af)
(cherry picked from commit 8fc213fcd4c5a6ddaa0d44965bcd0ca1afbbbc84)
commit 352794b1af16623861e95db7e4a38c4f1493a6d8
Author: Jeremy Allison <jra at samba.org>
Date: Fri Nov 21 22:44:23 2008 -0800
Revert c76e4791d3ae4f180fba209c29bd3774c00858cf - "Fix the logic bug that caused us to run into kernel oplocks on an open for a stream inside a file with stream_xattr module. On opening the base_fsp we must break existing oplocks." as it broke make test.
Jeremy.
(cherry picked from commit 4c82a8dd2f6fae1ea1722108c7f64e6a1286df15)
commit c7cf630c8f0b19d8fa9fb6405c65585192db81e4
Author: Jeremy Allison <jra at samba.org>
Date: Fri Nov 21 18:19:13 2008 -0800
Fix the logic bug that caused us to run into kernel oplocks on an open for a stream inside a file with stream_xattr module. On opening the base_fsp we must break existing oplocks.
Jeremy.
(cherry picked from commit c76e4791d3ae4f180fba209c29bd3774c00858cf)
commit a80a87be488b2792dc4cf646378c69deb2d3fd83
Author: Dan Sledz <dsledz at isilon.com>
Date: Fri Nov 14 18:41:17 2008 -0800
[PATCH] FreeBSD configure check for backtrace_symbols
On FreeBSD backtrace_symbols is defined in libexecinfo.so.1. Look for it
there as well.
(cherry picked from commit 22b21f63d9ebd6181d9ff577ec27e33982db85db)
commit 7bfab448607d3d97643cf178516c81840e1f8127
Author: Jeremy Allison <jra at samba.org>
Date: Fri Nov 21 16:04:31 2008 -0800
Use fxattr calls whenever possible (trying to work around the strange Linux kernel oplock bug).
Jeremy.
(cherry picked from commit 89d6bd5bc5398fbec6fbfb797ea6f10ad036c205)
commit a733f2e93bd74b8b03e93fddb589f1b9ab7c48cc
Author: Michael Adam <obnox at samba.org>
Date: Sun Sep 21 02:07:43 2008 +0200
winbindd_group: don't list the domain twice when expanding internal aliases
Before this, "getent group builtin\\administrators" expanded
domain group members in the form DOMAIN\domain\user.
Michael
(cherry picked from commit a0e36cdd05cc9f5354dd9e834077919b8ce64262)
commit c2c5619f98c4a9bdd8315be958bb2f3acf28bab7
Author: Michael Adam <obnox at samba.org>
Date: Sun Sep 21 02:06:44 2008 +0200
winbindd_group: sanely handle NULL domain in add_member().
Michael
(cherry picked from commit 0943858d0297291a73c040a1412b1708b340dac7)
commit 5a6bf238cdd25cc419eebc01f1c77782d46528e7
Author: Michael Adam <obnox at samba.org>
Date: Mon Sep 22 10:39:37 2008 +0200
winbindd_ads: honour "winbind use default domain" in lookup_groupmem().
This fixes the output of "getent group" when "winbind use default domain = yes"
with security = ads.
Michael
(cherry picked from commit e720a1533ba8063478a68ca94b39364a77529f41)
commit 52e8cb875ca632135b91eda74bca30e0d531d9f9
Author: Michael Adam <obnox at samba.org>
Date: Sun Sep 21 01:20:32 2008 +0200
winbindd_rpc: add domain prefix to username in lookup_groupmem().
This makes the output of "getent group" of a domain group show the
domain prefix with "security = domain".
Michael
(cherry picked from commit 5eacc680d2615a1d8a2b4d51a6d08fa7e09e080e)
commit d2975dd5b01e11e87797584e634e238513061c59
Author: Michael Adam <obnox at samba.org>
Date: Mon Sep 22 10:37:11 2008 +0200
winbindd_util: add fill_domain_username_talloc().
A talloc version of fill_domain_username().
Michael
(cherry picked from commit 3ad23ec3bd98aa55fa29c5c1cac60116b5fc00d2)
commit 04696b70758b0cb650345a5a2da97b42f4640e12
Author: Michael Adam <obnox at samba.org>
Date: Mon Sep 22 14:51:51 2008 +0200
winbindd: fix a comment typo
Michael
(cherry picked from commit d3e3c2c50ee404de25b46a06bd71f90a7214e69c)
commit 00b8f2d2fa11166b257daf7ce504affc08c056e3
Author: Michael Adam <obnox at samba.org>
Date: Mon Sep 22 10:34:57 2008 +0200
winbind_util: fix an implicit cast compile warning.
Michael
(cherry picked from commit 38020bdeb9115fe41038723a2ffaedb75df8e564)
commit 4f11a0c0b375085f942945d08b7c787f07eaf780
Author: Michael Adam <obnox at samba.org>
Date: Fri Nov 21 23:28:08 2008 +0100
winbindd: make all winbind rpc-methods static.
Now that the methods are no longer needed in winbindd_ads,
we can make them static again.
Michael
(cherry picked from commit fc82807659cf4ab23df8ae7b98edfc715b54f591)
commit 85ccc328a4fefeb1f2b0967d9e487ae83a10b860
Author: Michael Adam <obnox at samba.org>
Date: Fri Nov 21 02:24:06 2008 +0100
winbindd_ads: use the reconnect methods instead of the rpc methods directly
Some of the ads methods just point to the rpc methods.
This makes winbindd_ads use the reconnect methods instead of
calling the rpc methods directly in order to prevent
negative cache entries for e.g. name_to_sid, when the dc
has closed the connection without sending a reset.
Michael
(cherry picked from commit afd1cba6c18cb56ec13659cec7c86b32de2fda39)
commit b496ea66455cc637b34a7e54005fffcac203bb9c
Author: Michael Adam <obnox at samba.org>
Date: Thu Nov 20 23:26:35 2008 +0100
winbindd_ads: prevent negative GM/ cache entries due to broken connections
The ads lookup_groupmem() function calls lda_lookupsids to resolve sids
to names. This is tried only once. So in case the connection was broken,
e.g. closed by the server (without a reset packet), there will be an empty
GM/ cache entry for the requested group which will prevent proper working
of access checks among other checks for the expiry period.
This patch works around this problem by retrying once if the lsa_lookupsids
call fails, re-establishing the dc-connection, as we already do in many other
places (e.g. the winbindd retry methods for the rpc layer).
Michael
(cherry picked from commit 9d5af844c53ff2b25904c96d28546271a249debb)
commit 573e62e3a74f9c70d37802b45731ac628b69f76f
Author: Jeremy Allison <jra at samba.org>
Date: Fri Nov 21 12:32:11 2008 -0800
Second part of the fix for bug #5903 - vfs_streams_xattr breaks contents of the file
Jeremy.
(cherry picked from commit d4481329438d27a23ded85f01f5cf06725221d0e)
commit c56eb5fbcb69da4cecd08753f71d827a0b221f4e
Author: Jeremy Allison <jra at samba.org>
Date: Fri Nov 21 11:06:33 2008 -0800
Ensure we always reply in reply_printopen().
Jeremy.
(cherry picked from commit e2f699a5d1a2415ce37c052bf24bbecf0d41bae7)
commit fa9430c5674acd176e0a2887339f5514ce0ba8de
Author: Jeremy Allison <jra at samba.org>
Date: Fri Nov 21 10:46:31 2008 -0800
First part of fix for bug #5903 - vfs_streams_xattr breaks contents of the file.
Restructures parts of open code so that fsp must be allocated before calling
open_file_ntcreate(_internal). Also fix up file ref-counting inside files.c.
Jeremy.
(cherry picked from commit 1f36db34d7483614e1a4d6d5f3437205bcb20541)
commit f4f41b03b7a3e944fa2c8e31e0c003b8502a86af
Author: Yasuma Takeda <yasuma at osstech.co.jp>
Date: Thu Nov 20 11:36:51 2008 -0800
Fix bug #5909 - MS-DFS does not work on Vista, if link name includes multibyte character.
(cherry picked from commit cae1717f58c89faaf68502c72124ecd1728d3374)
commit fd9ddf0970a30e37c9e5c75491d717438d97c5d5
Author: Jeremy Allison <jra at samba.org>
Date: Thu Nov 20 10:55:23 2008 -0800
Second part of fix for bug #5891 - smbd crashed when viewing the eventlog exported by "eventlog list". Don't leak memory on error paths.
Jeremy.
(cherry picked from commit b4f01de83a6f65e065117e917fdb208ce6d58c01)
commit 66677920d6189ef8deae080d959e25c01a727339
Author: Michael Adam <obnox at samba.org>
Date: Thu Nov 20 16:31:44 2008 +0100
eventlog: don't crash in sync_eventlog_params().
When freeing the talloc ctx at the end of the routine,
it must be a talloc ctx created inside. talloc_tos() needs
to be valid after the function finishes, since callers
(may) have data attached to it.
Michael
Signed-off-by: Günther Deschner <gd at samba.org>
(cherry picked from commit 113c5d28edabdd17a2507e68aad612aa21c758f3)
(cherry picked from commit 3677b2edd42765e50335cdba1651eebc3518e2ae)
commit 288c03db4c463fc5d007fe999515df2be07a4b49
Author: Jeremy Allison <jra at samba.org>
Date: Wed Nov 19 16:48:53 2008 -0800
This code mixes up int and uint32 when pulling out of a TDB. This is very bad. Fixing... May fix bug #5891, not sure.
Jeremy.
(cherry picked from commit 3c92c4f3140d7817a66c6b8d601dd30e5d15c88d)
commit da611fafdf0f408ff0d20bf0e5138ebfa1722527
Author: Jeremy Allison <jra at samba.org>
Date: Wed Nov 19 11:31:05 2008 -0800
Fix error in commit for bugfix "Fix bug #5904 - libnss_wins causes SIGABRT while servicing getaddrinfo() request."
Jeremy.
(cherry picked from commit e4b4e9cafbb7dcda761b396a71be9ba4965956bc)
commit 9612e97ca5e571e1a203f78efb6df912b86054a3
Author: Jeremy Allison <jra at samba.org>
Date: Wed Nov 19 11:23:11 2008 -0800
Fix bug #5904 - libnss_wins causes SIGABRT while servicing getaddrinfo() request.
Jeremy.
(cherry picked from commit 89d234574b1a2f12b2d9d21c4286648d0da436c3)
commit 7dc71e636ba657518cbce4d2230523023a144e07
Author: Steven Danneman <steven.danneman at isilon.com>
Date: Sat Nov 15 13:07:15 2008 -0800
Fix extended DN parse error when AD object does not have a SID.
Some AD objects, like Exchange Public Folders, can be members of Security
Groups but do not have a SID attribute. This patch adds more granular return
errors to ads_get_sid_from_extended_dn(). Callers can now determine if a parse
error occured because of bad input, or the DN was valid but contained no SID.
I updated all callers to ignore SIDless objects when appropriate.
Also did some cleanup to the out paths of lookup_usergroups_memberof()
(cherry picked from commit 48959de11bdeea7f114d8019349b37ada1df5aef)
commit b7ec2e35f3b0c22e2e6281ab761b3279637c38fc
Author: Steven Danneman <steven.danneman at isilon.com>
Date: Fri Nov 14 19:16:12 2008 -0800
Whitespace and >80 column cleanups.
(cherry picked from commit 8a9df932bfcae6bb9bd60914e9c74d13b3dfcd30)
commit 462ec83bbffdad4c855aea76b7fa005beafd5e06
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 18 23:10:22 2008 +0100
Fix Bug #5898. ("net rpc shutdown" fails).
Guenther
(cherry picked from commit 40712b9ab1e915d405db45e2f18c72a9957158a9)
commit 8059b418eaf8d90233f2115c64d40db7cec371c3
Author: Dina Fine <dina at exanet.com>
Date: Tue Nov 18 12:44:19 2008 -0800
Fix bug #5908 - Samba 3.0.32 - internal change notify on share directory fails"
(cherry picked from commit a3c79bd8d09262257cf8c025753332fb639fc09e)
commit 69438d9f2ab00c546b264f62f4f8d346b10280e3
Author: Kai Blin <kai at samba.org>
Date: Tue Nov 18 16:31:34 2008 +0100
libsmb: Fix up pointer passed to cli_send_trans in cli_link_internal
Seems like this one fell victim to the pstring removal. The other callers seem
to be fine, even though removing the casts would make the code less confusing.
(cherry picked from commit aa26b0aa3d913b09ead97c2c0bbfade0dddcd251)
commit e399ea4d1581875e9928f9a61f624fe3ce4d4cb8
Author: Jeremy Allison <jra at samba.org>
Date: Tue Nov 18 10:58:48 2008 -0800
Re-structure Volker's patch to "Fix trans2findfirst for the large directory optimization". Makes the change clearer.
Jeremy.
(cherry picked from commit 71878cb566aa9edeb85ac134a1ad60cfbc2927fe)
commit 87a37d4adfbcf298f5666fcaad4cc498609158e7
Author: Volker Lendecke <vl at samba.org>
Date: Tue Nov 18 17:03:38 2008 +0100
Fix trans2findfirst for the large directory optimization
With
case sensitive = yes
preserve case = no
short preserve case = no
default case = upper
a "dir FOO.txt" would not find "FOO.TXT" because FOO.txt ends up unconverted in
the mask for mask_match.
Jeremy, please check!
Volker
(cherry picked from commit 0dbcc308e30b121268cdfcdd70c50c4ed38ab433)
(cherry picked from commit 96764065e2e2eaa13cb71bc9ea2d75800da7db4f)
commit 2808212e11058ef79a4e722f11ae71c893ed21ff
Author: Davide Sfriso <sfriso at virgilio.it>
Date: Mon Nov 17 15:40:43 2008 -0800
Fix bug #5906 when running winbindd on a Samba PDC. Winbindd crash on 'getent group'.
(cherry picked from commit 742ac5c45674446546b9e8ee22320a39d700b195)
commit 935d926ea12a1bf216f4718038c4020b9a570aa4
Author: Jeremy Allison <jra at samba.org>
Date: Mon Nov 17 14:05:55 2008 -0800
When clearing out vuid cache remember to set entries = 0.
Jeremy.
(cherry picked from commit 1daad740c6f0e3914b691b3e9c57aaf68ba0ca01)
commit 16eeb16ac6e5c264c7665ecf458bcddae18fd57e
Author: Jeremy Allison <jra at samba.org>
Date: Mon Nov 17 13:46:35 2008 -0800
Fix bug #5900 reported by monyo at samba.gr.jp - vfs_readonly.so does not work.
Jeremy.
(cherry picked from commit 4cd70457781907edf6641696cc311915905c96fa)
commit 4d988d0c9f22dda706ee1802985830ce4999f4d5
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 15:23:34 2008 +0100
s3 create-tarball.sh: Remove dashes in git commands.
Newer git versions (e.g. 1.6.0.2) do not provide the 'git-' commands
any longer.
Karolin
(cherry picked from commit 0cba859f12177aaf3ef2d96663f0a51f61c24d56)
(cherry picked from commit 3d64e67de2b50f7b781aa3f5ad13ec8e866d4333)
(cherry picked from commit aa41a80969bd413d5922c602c7309bd8c05f3181)
(cherry picked from commit 0b4dd0cb1f81126344a6fe3304b46f880089718d)
commit 4ec9af7ab637912e2c16dc779836b3455c4653b3
Author: Carsten Dumke <carsten at cdumke.de>
Date: Thu Nov 13 12:05:00 2008 -0600
net: Fix documentation of net rap printq info
The man-page (see net(8)) and the usage-info (call "net help rap printq") of
'net rap printq' do contain an option "list" but in net_rap.c
the option is named "info".
Rename the option "list" in the documentation (man-pages + usage) to "info" to
match the code.
Signed-off-by: Kai Blin <kai at samba.org>
(cherry picked from commit 0a7fb721cdc0d825cf246d53075ad32a81b2b31d)
commit 7ba051a8d0e94b2eadf8ab8fbd3792be8b7189d8
Author: TAKAHASHI Motonobu <monyo at samba.gr.jp>
Date: Sun Nov 16 13:17:16 2008 +0100
Fix bug 5901: Default for streams_depot location
(cherry picked from commit a512cc80890a2183d5643d8324fb9dc13fca1e9e)
commit 6769ca13c078417a2d8c0183102f6bacb01e497b
Author: Günther Deschner <gd at samba.org>
Date: Tue Jul 15 23:05:13 2008 +0200
fix build warning.
Guenther
(This used to be commit 507660706901a79544d436046127947e4baa7e52)
(cherry picked from commit 1939177582867fb54a416f3ea979ebd8d4335885)
(cherry picked from commit 3fdf541b282805bc59ade8eb9a66c216f035f714)
commit ad86b4c5b062882b9094e97e41b84266a4956478
Author: Volker Lendecke <vl at samba.org>
Date: Fri Nov 14 13:42:54 2008 +0100
Make memcache_add_talloc NULL out the source pointer
This is an orthogonality measure to make clear this pointer now belongs to the
cache.
(cherry picked from commit b0031a6e86565857e602f8011e57e2114835581a)
commit 22e928fec2cf2ec26b7eb0e2bb3851519760c876
Author: Volker Lendecke <vl at samba.org>
Date: Thu Nov 13 23:50:19 2008 +0100
Actually finish memcache_add_talloc
This fixes a memleak found by Martin Zielinski <mz at seh.de>. Thanks for
looking closely!
Volker
(cherry picked from commit 26b1fda4020b7f6629865ae1c62e9b464222e1a2)
commit 72f883cea0b4b69f639d30d79aceef34f0ec4fe4
Author: Volker Lendecke <vl at samba.org>
Date: Sat Jun 14 10:59:11 2008 +0200
Use the correct cups-devel test for HAVE_IPRINT also
(cherry picked from commit a42d7e1146e7469062ead2c8f22f549a48154e03)
(cherry picked from commit 70e5b876b6b422c44ea588dbe319b6ce86a035d7)
commit 1e2f5c4465b76f3cb86b001c9e3a7212c65835d7
Author: Volker Lendecke <vl at samba.org>
Date: Sat Jun 14 10:31:11 2008 +0200
Correctly check for presence of cups-devel
On SuSE at least cups-config belongs to cups-libs which does not contain the
headers which are in cups-devel.
(cherry picked from commit 2408d2493f7c6e0beee58febd547516bbeb0929d)
(cherry picked from commit 27b0b8f99c6d5b43d9b9079aa74789e27d0a8d84)
commit ac32a6c391d784551542fecb98c3314deef383dd
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 14 19:49:11 2008 +0100
winbind: fix build warning.
Guenther
(cherry picked from commit 3d2570150201e357f31e3d651bc05b7234c84796)
commit 447382ec1809555fd2cc3f6395a2a9873352b133
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 14 17:53:29 2008 +0100
make some more parts of security.idl public and re-run make idl.
Guenther
(cherry picked from commit 9bca541af7204fedd549a54eec7aa80ed565a8c1)
commit fe3fb90e63c40fd496d9b6c18c4d951616458de0
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 14 16:12:34 2008 +0100
re-run make idl.
Guenther
(cherry picked from commit 19568f4e4e94266a7792e6dce8eaa5086f435fc3)
(cherry picked from commit 9c35abfd79d42b1ba04ad8a72a45c4471f8c2fa7)
commit f32809939f527bb3de0ff6ea7a5e512dcdbb7417
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Nov 7 10:49:59 2008 +0100
security.idl: sometimes ACEs have some padding at the end
metze
(cherry picked from commit 2dc120377baec2c8b7c9b6fe40d15218588c97fd)
(cherry picked from commit 3fa176b5552341ed8ccd40786bd4caee39b414df)
commit ca6dda446e64e49e1d29c5e695a430bee9b04844
Author: Volker Lendecke <vl at samba.org>
Date: Fri Nov 14 13:13:40 2008 +0100
Rename some variables in getpwnam_alloc() for clarity
(cherry picked from commit 71bc142bea33af124f07b6244f97bde289fe3a2d)
commit 503623568c5159c10e8e58e3a69ac65b8d80fa69
Author: Volker Lendecke <vl at samba.org>
Date: Fri Nov 14 12:49:18 2008 +0100
sys_pwnam doesn't return talloced memory, so don't mix up the returned struct.
(cherry picked from commit eb99923991960e53bd150ac8f1d818cb746101b4)
commit 8a041f7a101608f3de8ce0a0b41bdc3d8e8a9547
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 13 21:11:12 2008 +0100
re-run make idl.
Guenther
(cherry picked from commit 86deff8d6e6b8e094b15a4e5392098d9b23e5ff5)
(cherry picked from commit b04a4001813cf0427539a52b0abd2e9a1fa1e5eb)
commit 74770e30cc4168fbf7fedf1a01532aac81dcde65
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 13 21:11:31 2008 +0100
Fix PNP_GetHwProfInfo() (fixes Bug: #5888).
Guenther
(cherry picked from commit 111ec984729fe2c47e173dab82f438bcacf42d1c)
(cherry picked from commit 420b68ae51df5b407b7a87033084d41433ef3267)
commit 7b00730704aed05e1ee689809c9ac4ecc2208403
Author: Jeremy Allison <jra at samba.org>
Date: Wed Nov 12 19:26:58 2008 -0800
Pretty print out SD's on get/set.
Jeremy.
(cherry picked from commit ddd3e0524707d732143c1fb831c1ce2bf67dc2bf)
commit 1466ba45f2f79966efbd19513bc533e093313a0b
Author: Jeremy Allison <jra at samba.org>
Date: Wed Nov 12 14:03:54 2008 -0800
Fix memory leak in error path, spotted by Martin Zielinski <mz at seh.de>.
Jeremy.
(cherry picked from commit a2b17597ea4ad171411a972ba4aa0c14b0f2b058)
commit 1aeeae2627cae270b7ebc98da73a835647983b8c
Author: Jeremy Allison <jra at samba.org>
Date: Tue Nov 11 14:38:36 2008 -0800
Fix bug 5891] : smbd crashed when viewing the eventlog exported by "eventlog list"
Don't mix TALLOC and SAFE_FREE().
Jeremy.
(cherry picked from commit d54624159adc91f82f46e0635d59fc7d858db48f)
commit 34c7678cb5c726f0a4c158d5ac8463bf20667793
Author: Jeremy Allison <jra at samba.org>
Date: Tue Nov 11 14:20:53 2008 -0800
Fix bug 5889. "delete veto files = no" seems to break.
Jeremy.
(cherry picked from commit 5a58a4f2b689571c52c90d04c969fe3c56551c5c)
commit 2b9c5d5aac8f1b7f704eeee9a96e80a17c56beb8
Author: Michael Adam <obnox at samba.org>
Date: Mon Nov 10 15:01:18 2008 +0100
build: prevent make errors for picky makes when $(EXTRA_ALL_TARGETS) is empty
picky make implementations don't like lines with only tabs in rules or dependencie
Michael
(cherry picked from commit 058d1e2d0a4985825a62d2adc336a48d91ae4771)
commit 0195373b04dc5f7ba416322b3120f8008adb4298
Author: Martin Schwenke <martin at meltin.net>
Date: Fri Nov 7 12:20:59 2008 +1100
Add @CIFSUPCALL_PROGS@ to "all" target so cifs.upcall gets built at
compile time rather than install time. This stops problems where
packaging scripts pass CFLAGS to "make" but not "make install".
Signed-off-by: Martin Schwenke <martin at meltin.net>
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 884349af686faaf7b6bfec08eb2ac5dbc8e30fe5)
commit 21c05fcec501ebeca32b7b0f44e390c472a9b2fb
Author: Kai Blin <kai at samba.org>
Date: Fri Nov 7 09:50:33 2008 +0100
ntlm_auth: Put huge NTLMv2 blobs into extra_data on CRAP auth
This fixes bug #5865
(cherry picked from commit 29257fb4a8faf0ccb49dc4dcb6871a145c5b7f21)
commit f8e5dc1a7506494a3e04855d7ec1d9638b2e005d
Author: Jeff Layton <jlayton at redhat.com>
Date: Thu Nov 6 15:15:57 2008 -0500
mount.cifs: use lock/unlock_mtab scheme from util-linux-ng mount prog
The util-linux-ng sources have a good, but rather complex scheme for
locking the mtab before updating it. Mount helpers need to follow the
same scheme. Advisory locking only works if everyone is using the same
locking scheme.
Copy the routines we need from util-linux-ng into a separate source file
and then have mount.cifs and umount.cifs link in this object.
The long term goal is to have these routines in a separate helper
library (libmount). Mount helpers can then dynamically link in that lib.
Until that happens, this should serve as a suitable stopgap solution.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit ecabc19a114657f38c48a19073eb970338f97010)
commit 3b6eb50b5cfb3959031bd3432e6eea6b53bfa8bf
Author: Jeremy Allison <jra at samba.org>
Date: Thu Nov 6 06:40:35 2008 -0800
Fix bug #5825 - Account locking out doesnt work with an LDAP backend.Based on a problem found by Boyang. Only the pdb_nds backend implements login attempts so this was broken for tdbsam and ldap.
Jeremy.
(cherry picked from commit ab984c93a2b197368ad21cfa0982ac2438ec57bf)
commit 87ce7e82dc6b754962341e84bf89a4a8e6da9221
Author: Jeremy Allison <jra at samba.org>
Date: Wed Nov 5 19:11:53 2008 -0800
Add reference to bug #4308 to remind me to add regression test to smbtorture.
Jeremy.
(cherry picked from commit b0027aebdfece34a4fa6d5a796989232992dbc59)
commit 183a5e5f87fa3d4cec45d714fc6295f68ea80bf9
Author: Joe Smith <yasumoto7 at gmail.com>
Date: Tue Nov 4 20:31:04 2008 +0100
Fixed typo in source/utils/net_rap.c
(cherry picked from commit 6c5d5665f24b7317f392d404a600170eacd2b39c)
commit 4eda1958a62b283b2a058aaf053ebda9a0036957
Author: Volker Lendecke <vl at samba.org>
Date: Tue Nov 4 04:33:36 2008 -0800
Ignore 3.0 style invalid group mappings during upgrade to ldb
(cherry picked from commit aed67987cac4daa56fe04c9330a8083223a48a1d)
commit db6dd479de1ee8d0118e785c4b5cc48502f466ea
Author: Volker Lendecke <vl at samba.org>
Date: Mon Nov 3 17:09:40 2008 +0100
Fix bug triggered by the RAW-SAMBA3OPLOCKLOGOFF test
(cherry picked from commit 71ed975a608126769c9669409d46c894da3ca43e)
commit bb3e189c67b10aaae66993ced1c214c7a63d026a
Author: Michael Adam <obnox at samba.org>
Date: Sun Nov 2 23:02:02 2008 +0100
winbindd: speed up fill_grent_mem (i.e. winbindd_getgrent) a lot.
With large groups, getgrent ran into timeouts because after each
single user that was added to the expanded group list, the list
was sorted and made unique.
Now the list is sorted just once after all members have been added.
Michael
(cherry picked from commit ea0858842d20966796bb47f20bae04bbb7232643)
commit db6b38422962011155c911e275239cac968784cd
Author: Volker Lendecke <vl at samba.org>
Date: Sun Nov 2 10:28:00 2008 +0100
Fix bug 5860: safe_strcpy gives a nasty error message for overlong strings
Thanks to Robert Dahlem <Robert.Dahlem at gmx.net> for reporting this!
(cherry picked from commit 9c4617f18f851e3f79061ba89ce0d50a83c6563d)
commit 0a81d7d923d9e680ec2117103cb50c9cf0a8ed9f
Author: Andrew Tridgell <tridge at samba.org>
Date: Thu Oct 30 12:32:06 2008 -0700
use glibc sys/inotify.h header
when we first added the inotify code glibc didn't have the inotify
functions yet. Now that it does we can use the official header and
avoid the asm/unistd.h syscall workaround
(cherry picked from commit 09b629e2c42315f8d4dcd0106de9ea840ac28721)
commit ade088e89b62e76096c9cd8b2f47ce3fd349c754
Author: Günther Deschner <gd at samba.org>
Date: Mon Aug 25 11:36:56 2008 +0200
auth: Fix build warning.
Guenther
(cherry picked from commit 4661ef625a6522d6f859b83e3e3702f01d0b952f)
(cherry picked from commit 60649a74cdf2594bc89c301025f86d23caba91c2)
(cherry picked from commit 680ec1bb2c2e987a40d9d08a14dab6b2e44152a7)
commit 7a3c3bf36f8c88a2a091325c558af640ccaa2132
Author: Jeremy Allison <jra at samba.org>
Date: Wed Oct 29 17:07:54 2008 -0700
Fix CID: 456 - resource leak on function exit.
Jeremy.
(cherry picked from commit 39dd4d55c8cf65641e5c6fbd227d9c92785278c9)
commit 157ebfd5c4a8e56a5760b5e30de4ffcfea81270c
Author: Jeremy Allison <jra at samba.org>
Date: Wed Oct 29 16:43:29 2008 -0700
Fix CID 606 - failed to return -1 after socket() fail.
Jeremy.
(cherry picked from commit fb69ff191ded20f58054e398fc67227b63ecb673)
commit 717d7af3eaa8fe8f890743dbda696e303dcf0db7
Author: Jeremy Allison <jra at samba.org>
Date: Wed Oct 29 16:28:04 2008 -0700
Fix CID 574 - tidies up the code expression.
Jeremy.
(cherry picked from commit 64ae7048fefe39d05d0c2c92e3c96b6d83fd8ef5)
commit d362e859f06e0dffc84909d03c50f1c8f3e08efa
Author: Jeremy Allison <jra at samba.org>
Date: Wed Oct 29 16:02:16 2008 -0700
Coverity fix CID: 592 - null deref (can't happen but doesn't hurt to be sure).
Jeremy.
(cherry picked from commit 7b24a4af219331b12836cd03353fb6a52ddae11c)
commit 1c2b4db42cc75f2f2603f0d96098cfea12d2e0ca
Author: Jeremy Allison <jra at samba.org>
Date: Wed Oct 29 15:54:57 2008 -0700
Coverity fix #CID: 607 - resource leak on error path.
Jeremy.
(cherry picked from commit 2d06ea18caf0cb764bb20e80828d791bf497eae4)
commit 32932b40c0ad95711200af4287d581ddbcfe2182
Author: Michael Adam <obnox at samba.org>
Date: Mon Oct 27 14:28:44 2008 +0100
winbind: fix smbd hanging on Solaris when winbindd closes socket.
On some versions of Solaris, we observed a strange effect of close(2)
on a socket: After the server (here winbindd) called close, the client fd
was not marked as readable for select. And a write call to the fd did
not produce an error EPIPE but just returned as if successful.
So while winbindd had called remove_client(), the corresponding smbd
still thought that it was connected, but failed to retrieve answers
for its queries.
This patch works around the problem by forcing the client fd to
the readable state: Just write one byte into the socket before
closing.
Michael
(cherry picked from commit 6cd1575e1cf7564f7c7c56eedf58af8dcb709f44)
commit cbdd3767854e72f64aa5385176a246cc49f9f389
Author: Michael Adam <obnox at samba.org>
Date: Mon Oct 27 13:50:27 2008 +0100
build: fix bug #5765 - fix installlibs on solaris by using portable "test -r"
instead of test -e, which /bin/sh on solaris does not know.
Michael
(cherry picked from commit ed05ee03c59c7fe9994aaa79b15eb6984d641755)
commit b40fdb68461d8e961f6c009ce72381415defa3da
Author: Michael Adam <obnox at samba.org>
Date: Mon Oct 27 12:59:11 2008 +0100
build: fix bug #5677 - fix test_{shlibs,nss_modules,pam_modules} on Solaris
and other systems where sh does not support "export FOO=bar"
by separating setting and exporting the variable.
Thanks to Yasuma Takeda <yasuma at osstech.co.jp> for the patch.
Michael
(cherry picked from commit be4496be7b7196df4710e1a45878d62c34386305)
commit 2c9a114a8481dc3462faa3bbdcb7fe64b74afadc
Author: Derrell Lipman <derrell.lipman at unwireduniverse.com>
Date: Fri Oct 24 11:35:10 2008 -0400
Error return is boolean false, not -1
- There were a few places in SMBC_getatr() that returned -1 instead of a
boolean. -1 was intended to mean error, but that's what False/false is for,
and the usages of this function assume that it returns a boolean false as
the error condition.
- per Jelmer's request, use false vs. False in new code, even if not making
changes globally.
Derrell
(cherry picked from commit 623391308f3fb26fdc2515baf41bb57ac1e5fc96)
commit 607f11f949ffc4a98262e4e471c4f743b18e8cf7
Author: Günther Deschner <gd at samba.org>
Date: Thu Oct 23 03:31:32 2008 +0200
s3-samr-server: unify callback convention: _samr_UserSetInfo.
Guenther
(cherry picked from commit aa301e82d0c44c6a733e8be2546d661ea56512ef)
(cherry picked from commit dcc40a6adec5d00c29a062164cbc68ff4a7779f8)
commit d9d5bf5031374d1a410cb498c5f85aa58dcd5006
Author: Günther Deschner <gd at samba.org>
Date: Thu Oct 23 03:30:58 2008 +0200
s3-samr-server: unify callback convention: _samr_QueryDomainInfo.
Guenther
(cherry picked from commit ac2c35bc379de83091644455dbeba0bea3e5ceb6)
(cherry picked from commit 02bc790f209f56cc704566ded46973efc35f4a4f)
commit c515917bad2540c1f909ce36e8a16a451052bf51
Author: Günther Deschner <gd at samba.org>
Date: Thu Oct 23 03:30:14 2008 +0200
s3-samr-server: fix return code in _samr_QueryDisplayInformation.
Guenther
(cherry picked from commit 30fa6c3ba19a8f816043405ba5d9eec84dd1c97b)
(cherry picked from commit 0f6a80fb198f3cc4ffc875c77da3ff3d8b8c5ca3)
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages-3/net.8.xml | 2 +-
docs-xml/smbdotconf/security/writeable.xml | 2 +
release-scripts/create-tarball | 8 +-
source/Makefile.in | 34 ++--
source/auth/pampass.c | 5 +-
source/auth/token_util.c | 6 +-
source/client/client.c | 2 +-
source/client/mount.cifs.c | 110 +++++----
source/client/mount.h | 38 +++
source/client/mtab.c | 219 ++++++++++++++++++
source/client/umount.cifs.c | 22 +--
source/configure.in | 41 +++-
source/groupdb/mapping_ldb.c | 7 +
source/include/vfs_macros.h | 6 +-
source/lib/debug.c | 2 +-
source/lib/interface.c | 10 +-
source/lib/memcache.c | 31 +++-
source/lib/popt_common.c | 2 +-
source/lib/readline.c | 1 +
source/lib/replace/autoconf-2.60.m4 | 2 +
source/lib/util_pw.c | 26 +--
source/lib/util_sock.c | 14 +-
source/libads/kerberos.c | 6 +-
source/libads/ldap.c | 86 ++++---
source/librpc/gen_ndr/cli_ntsvcs.c | 8 +-
source/librpc/gen_ndr/cli_ntsvcs.h | 4 +-
source/librpc/gen_ndr/ndr_ntsvcs.c | 46 ++--
source/librpc/gen_ndr/ndr_security.c | 31 +--
source/librpc/gen_ndr/ndr_security.h | 6 +
source/librpc/gen_ndr/ntsvcs.h | 10 +-
source/librpc/gen_ndr/security.h | 4 +-
source/librpc/idl/ntsvcs.idl | 10 +-
source/librpc/idl/security.idl | 8 +-
source/librpc/ndr/ndr_sec_helper.c | 31 +++
source/libsmb/cliconnect.c | 2 +-
source/libsmb/clidfs.c | 4 +-
source/libsmb/clifile.c | 2 +-
source/libsmb/clilist.c | 2 +-
source/libsmb/clirap2.c | 7 +-
source/libsmb/libsmb_file.c | 6 +-
source/libsmb/libsmb_server.c | 6 +-
source/libsmb/namequery.c | 10 +-
source/libsmb/namequery_dc.c | 4 +-
source/libsmb/smb_seal.c | 7 +
source/modules/gpfs.c | 92 ++++----
source/modules/vfs_prealloc.c | 2 +-
source/modules/vfs_readonly.c | 9 +
source/modules/vfs_smb_traffic_analyzer.c | 1 +
source/modules/vfs_streams_depot.c | 121 ++++++++++-
source/modules/vfs_streams_xattr.c | 339 ++++++++++++++++++++++++++--
source/modules/vfs_tsmsm.c | 2 +-
source/modules/vfs_zfsacl.c | 83 +++++++
source/nsswitch/libwbclient/wbc_sid.c | 12 +-
source/nsswitch/winbind_struct_protocol.h | 4 +-
source/nsswitch/wins.c | 63 ++++--
source/param/loadparm.c | 16 ++-
source/passdb/pdb_interface.c | 18 +-
source/printing/printfsp.c | 15 +-
source/rpc_server/srv_eventlog_lib.c | 42 ++--
source/rpc_server/srv_eventlog_nt.c | 20 +-
source/rpc_server/srv_samr_nt.c | 116 ++++------
source/rpcclient/rpcclient.c | 2 +-
source/script/tests/selftest.sh | 2 +-
source/smbd/close.c | 8 +-
source/smbd/fake_file.c | 1 -
source/smbd/filename.c | 42 ++--
source/smbd/files.c | 82 +++----
source/smbd/mangle.c | 2 +-
source/smbd/msdfs.c | 12 +-
source/smbd/notify.c | 3 +
source/smbd/notify_inotify.c | 10 +-
source/smbd/nttrans.c | 10 +
source/smbd/open.c | 204 +++++++++++------
source/smbd/posix_acls.c | 10 +-
source/smbd/process.c | 1 +
source/smbd/reply.c | 73 ++++++-
source/smbd/server.c | 5 +-
source/smbd/share_access.c | 8 +-
source/smbd/trans2.c | 110 +++++++--
source/smbd/uid.c | 54 +++++-
source/smbd/vfs.c | 8 +-
source/torture/locktest.c | 4 +-
source/torture/masktest.c | 4 +-
source/torture/torture.c | 35 +++-
source/utils/net.c | 2 +-
source/utils/net_rap.c | 4 +-
source/utils/net_rpc.c | 7 +-
source/utils/ntlm_auth.c | 18 ++-
source/utils/smbcacls.c | 2 +-
source/utils/smbcquotas.c | 2 +-
source/utils/smbfilter.c | 2 +-
source/utils/smbtree.c | 16 +-
source/winbindd/winbindd.c | 7 +-
source/winbindd/winbindd_ads.c | 249 +++++++++++++++------
source/winbindd/winbindd_async.c | 2 +-
source/winbindd/winbindd_cm.c | 2 +-
source/winbindd/winbindd_dual.c | 2 +-
source/winbindd/winbindd_group.c | 59 +++--
source/winbindd/winbindd_pam.c | 25 ++-
source/winbindd/winbindd_passdb.c | 5 +-
source/winbindd/winbindd_rpc.c | 68 +++---
source/winbindd/winbindd_user.c | 2 +-
source/winbindd/winbindd_util.c | 30 +++-
103 files changed, 2202 insertions(+), 837 deletions(-)
create mode 100644 source/client/mount.h
create mode 100644 source/client/mtab.c
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml
index cdf0fbb..876992d 100644
--- a/docs-xml/manpages-3/net.8.xml
+++ b/docs-xml/manpages-3/net.8.xml
@@ -395,7 +395,7 @@ current network.</para>
<title>RAP PRINTQ</title>
<refsect3>
-<title>RAP PRINTQ LIST <replaceable>QUEUE_NAME</replaceable></title>
+<title>RAP PRINTQ INFO <replaceable>QUEUE_NAME</replaceable></title>
<para>Lists the specified print queue and print jobs on the server.
If the <replaceable>QUEUE_NAME</replaceable> is omitted, all
diff --git a/docs-xml/smbdotconf/security/writeable.xml b/docs-xml/smbdotconf/security/writeable.xml
index f811c47..99678a9 100644
--- a/docs-xml/smbdotconf/security/writeable.xml
+++ b/docs-xml/smbdotconf/security/writeable.xml
@@ -6,4 +6,6 @@
<description>
<para>Inverted synonym for <smbconfoption name="read only"/>.</para>
</description>
+
+<value type="default">no</value>
</samba:parameter>
diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball
index 3463f01..da39d89 100755
--- a/release-scripts/create-tarball
+++ b/release-scripts/create-tarball
@@ -137,7 +137,7 @@ function createReleaseTag
return 0
fi
- if [ "x`git-tag -l ${OPT_TAG}`" != "x" ]; then
+ if [ "x`git tag -l ${OPT_TAG}`" != "x" ]; then
echo -n "Tag exists. Do you wish to overwrite? (y/N): "
read answer
@@ -155,7 +155,7 @@ function createReleaseTag
fi
fi
- git-tag -u ${OPT_KEYID} ${OPT_TAG}
+ git tag -u ${OPT_KEYID} ${OPT_TAG}
exitOnError $? "Failed to create tag"
return 0
@@ -170,7 +170,7 @@ function main
cd $TOPDIR
- git-checkout ${OPT_BRANCH}
+ git checkout ${OPT_BRANCH}
exitOnError $? "Invalid branch name \"${OPT_BRANCH}\""
(cd source && ./script/mkversion.sh)
@@ -188,7 +188,7 @@ function main
echo "Creating release tarball for Samba $version"
/bin/rm -rf ../samba-${version}
- git-archive --format=tar --prefix=samba-${version}/ HEAD | (cd .. && tar xf -)
+ git archive --format=tar --prefix=samba-${version}/ HEAD | (cd .. && tar xf -)
exitOnError $? "Failed to create release directory tree"
pushd ../samba-${version}
diff --git a/source/Makefile.in b/source/Makefile.in
index 3573ead..730e130 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -221,7 +221,9 @@ NSS_INFO_MODULES = @NSS_INFO_MODULES@
MODULES = $(VFS_MODULES) $(PDB_MODULES) $(RPC_MODULES) $(IDMAP_MODULES) \
$(CHARSET_MODULES) $(AUTH_MODULES) $(NSS_INFO_MODULES)
-######################################################################
+EXTRA_ALL_TARGETS = @EXTRA_ALL_TARGETS@
+
+#####################################################################
# object file lists
######################################################################
@@ -851,9 +853,9 @@ CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
$(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
$(LIBNDR_GEN_OBJ0)
-CIFS_MOUNT_OBJ = client/mount.cifs.o
+CIFS_MOUNT_OBJ = client/mount.cifs.o client/mtab.o
-CIFS_UMOUNT_OBJ = client/umount.cifs.o
+CIFS_UMOUNT_OBJ = client/umount.cifs.o client/mtab.o
CIFS_UPCALL_OBJ = client/cifs.upcall.o
@@ -1093,7 +1095,8 @@ VLP_OBJ = $(VLP_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
# now the rules...
######################################################################
all:: SHOWFLAGS libs $(SBIN_PROGS) $(BIN_PROGS) $(ROOT_SBIN_PROGS) \
- $(MODULES) $(NSS_MODULES) $(PAM_MODULES) @EXTRA_ALL_TARGETS@
+ $(MODULES) $(NSS_MODULES) $(PAM_MODULES) @CIFSUPCALL_PROGS@ \
+ $(EXTRA_ALL_TARGETS)
nss_modules:: $(NSS_MODULES)
@@ -1576,7 +1579,7 @@ installlibtalloc:: installdirs libtalloc
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-$(INSTALLLIBCMD_SH) $(LIBTALLOC_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)`
- -if test -e $(LIBTALLOC_SHARED_TARGET_SONAME) ; then \
+ -if test -r $(LIBTALLOC_SHARED_TARGET_SONAME) ; then \
ln -s -f `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` \
$(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)` ; \
fi
@@ -1643,7 +1646,7 @@ installlibtdb:: installdirs libtdb
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-$(INSTALLLIBCMD_SH) $(LIBTDB_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)`
- -if test -e $(LIBTDB_SHARED_TARGET_SONAME) ; then \
+ -if test -r $(LIBTDB_SHARED_TARGET_SONAME) ; then \
ln -s -f `basename $(LIBTDB_SHARED_TARGET_SONAME)` \
$(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)` ; \
fi
@@ -1716,7 +1719,7 @@ installlibwbclient:: installdirs libwbclient
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-$(INSTALLLIBCMD_SH) $(LIBWBCLIENT_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET)`
- -if test -e $(LIBWBCLIENT_SHARED_TARGET_SONAME) ; then \
+ -if test -r $(LIBWBCLIENT_SHARED_TARGET_SONAME) ; then \
ln -s -f `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` \
$(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET)` ; \
fi
@@ -1776,7 +1779,7 @@ installlibaddns:: installdirs libaddns
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-$(INSTALLLIBCMD_SH) $(LIBADDNS_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_SHARED_TARGET)`
- -if test -e $(LIBADDNS_SHARED_TARGET_SONAME) ; then \
+ -if test -r $(LIBADDNS_SHARED_TARGET_SONAME) ; then \
ln -s -f `basename $(LIBADDNS_SHARED_TARGET_SONAME)` \
$(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_SHARED_TARGET)` ; \
fi
@@ -1856,7 +1859,7 @@ installlibnetapi:: installdirs libnetapi
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-$(INSTALLLIBCMD_SH) $(LIBNETAPI_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_SHARED_TARGET)`
- -if test -e $(LIBNETAPI_SHARED_TARGET_SONAME) ; then \
+ -if test -r $(LIBNETAPI_SHARED_TARGET_SONAME) ; then \
ln -s -f `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` \
$(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_SHARED_TARGET)` ; \
fi
@@ -1917,7 +1920,7 @@ installlibsmbclient:: installdirs libsmbclient
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-$(INSTALLLIBCMD_SH) $(LIBSMBCLIENT_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_SHARED_TARGET)`
- -if test -e $(LIBSMBCLIENT_SHARED_TARGET_SONAME) ; then \
+ -if test -r $(LIBSMBCLIENT_SHARED_TARGET_SONAME) ; then \
ln -s -f `basename $(LIBSMBCLIENT_SHARED_TARGET_SONAME)` \
$(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_SHARED_TARGET)` ; \
fi
@@ -1988,7 +1991,7 @@ installlibsmbsharemodes:: installdirs libsmbsharemodes
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-$(INSTALLLIBCMD_SH) $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_SHARED_TARGET)`
- -if test -e $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME) ; then \
+ -if test -r $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME) ; then \
ln -s -f `basename $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)` \
$(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_SHARED_TARGET)` ; \
fi
@@ -2701,7 +2704,8 @@ Makefile: $(srcdir)/Makefile.in config.status
# Check shared libs for unresolved symbols
test_shlibs:
@echo "Testing $? "
- @export $(LIB_PATH_VAR)=./bin && \
+ @$(LIB_PATH_VAR)=./bin && \
+ export $(LIB_PATH_VAR) && \
for module in $?; do \
./script/tests/dlopen.sh $${module} \
|| exit 1; \
@@ -2710,7 +2714,8 @@ test_shlibs:
# Check for NSS module problems.
test_nss_modules:: nss_modules
@echo "Testing $(NSS_MODULES) "
- @export $(LIB_PATH_VAR)=./bin && \
+ @$(LIB_PATH_VAR)=./bin && \
+ export $(LIB_PATH_VAR) && \
for module in $(NSS_MODULES); do \
./script/tests/dlopen.sh $${module} \
|| exit 1; \
@@ -2720,7 +2725,8 @@ test_nss_modules:: nss_modules
# built can actually be loaded by a minimal PAM-aware application.
test_pam_modules:: pam_modules
@echo "Testing $(PAM_MODULES) "
- @export $(LIB_PATH_VAR)=./bin && \
+ @$(LIB_PATH_VAR)=./bin && \
+ export $(LIB_PATH_VAR) && \
for module in $(PAM_MODULES); do \
./script/tests/dlopen.sh -lpam -ldl bin/$${module}. at SHLIBEXT@ \
|| exit 1; \
diff --git a/source/auth/pampass.c b/source/auth/pampass.c
index 58921bd..9345eed 100644
--- a/source/auth/pampass.c
+++ b/source/auth/pampass.c
@@ -63,6 +63,7 @@ typedef int (*smb_pam_conv_fn)(int, const struct pam_message **, struct pam_resp
* Macros to help make life easy
*/
#define COPY_STRING(s) (s) ? SMB_STRDUP(s) : NULL
+#define COPY_FSTRING(s) (s[0]) ? SMB_STRDUP(s) : NULL
/*******************************************************************
PAM error handler.
@@ -327,7 +328,7 @@ static int smb_pam_passchange_conv(int num_msg,
DEBUG(100,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_ON: We actualy sent: %s\n", current_reply));
#endif
reply[replies].resp_retcode = PAM_SUCCESS;
- reply[replies].resp = COPY_STRING(current_reply);
+ reply[replies].resp = COPY_FSTRING(current_reply);
found = True;
break;
}
@@ -355,7 +356,7 @@ static int smb_pam_passchange_conv(int num_msg,
DEBUG(10,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_OFF: We sent: %s\n", current_reply));
pwd_sub(current_reply, udp->PAM_username, udp->PAM_password, udp->PAM_newpassword);
reply[replies].resp_retcode = PAM_SUCCESS;
- reply[replies].resp = COPY_STRING(current_reply);
+ reply[replies].resp = COPY_FSTRING(current_reply);
#ifdef DEBUG_PASSWORD
DEBUG(100,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_OFF: We actualy sent: %s\n", current_reply));
#endif
diff --git a/source/auth/token_util.c b/source/auth/token_util.c
index cd67c2a..bdf6124 100644
--- a/source/auth/token_util.c
+++ b/source/auth/token_util.c
@@ -77,7 +77,7 @@ bool nt_token_check_domain_rid( NT_USER_TOKEN *token, uint32 rid )
NT_USER_TOKEN *get_root_nt_token( void )
{
- struct nt_user_token *token = NULL;
+ struct nt_user_token *token, *for_cache;
DOM_SID u_sid, g_sid;
struct passwd *pw;
void *cache_data;
@@ -107,9 +107,11 @@ NT_USER_TOKEN *get_root_nt_token( void )
token->privileges = se_disk_operators;
+ for_cache = token;
+
memcache_add_talloc(
NULL, SINGLETON_CACHE_TALLOC,
- data_blob_string_const("root_nt_token"), token);
+ data_blob_string_const("root_nt_token"), &for_cache);
return token;
}
diff --git a/source/client/client.c b/source/client/client.c
index dc5e0f5..1954bef 100644
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -4614,7 +4614,7 @@ static int do_message_op(void)
snprintf(name_type_hex, sizeof(name_type_hex), "#%X", name_type);
fstrcat(server_name, name_type_hex);
- zero_addr(&ss);
+ zero_sockaddr(&ss);
if (have_ip)
ss = dest_ss;
diff --git a/source/client/mount.cifs.c b/source/client/mount.cifs.c
index 9278295..2e059e8 100644
--- a/source/client/mount.cifs.c
+++ b/source/client/mount.cifs.c
@@ -39,9 +39,10 @@
#include <mntent.h>
#include <fcntl.h>
#include <limits.h>
+#include "mount.h"
#define MOUNT_CIFS_VERSION_MAJOR "1"
-#define MOUNT_CIFS_VERSION_MINOR "11"
+#define MOUNT_CIFS_VERSION_MINOR "12"
#ifndef MOUNT_CIFS_VENDOR_SUFFIX
#ifdef _SAMBA_BUILD_
@@ -79,15 +80,6 @@
#define MOUNT_PASSWD_SIZE 64
#define DOMAIN_SIZE 64
-/* exit status - bits below are ORed */
-#define EX_USAGE 1 /* incorrect invocation or permission */
-#define EX_SYSERR 2 /* out of memory, cannot fork, ... */
-#define EX_SOFTWARE 4 /* internal mount bug or wrong version */
-#define EX_USER 8 /* user interrupt */
-#define EX_FILEIO 16 /* problems writing, locking, ... mtab/fstab */
-#define EX_FAIL 32 /* mount failure */
-#define EX_SOMEOK 64 /* some mount succeeded */
-
const char *thisprogram;
int verboseflag = 0;
static int got_password = 0;
@@ -441,6 +433,7 @@ static int parse_options(char ** optionsp, int * filesys_flags)
goto nocopy;
} else {
printf("username specified with no parameter\n");
+ SAFE_FREE(out);
return 1; /* needs_arg; */
}
} else {
@@ -473,6 +466,7 @@ static int parse_options(char ** optionsp, int * filesys_flags)
domain_name = check_for_domain(&value);
} else {
printf("username too long\n");
+ SAFE_FREE(out);
return 1;
}
}
@@ -488,6 +482,7 @@ static int parse_options(char ** optionsp, int * filesys_flags)
got_password = 1;
} else {
printf("password too long\n");
+ SAFE_FREE(out);
return 1;
}
} else if (strncmp(data, "sec", 3) == 0) {
@@ -504,6 +499,7 @@ static int parse_options(char ** optionsp, int * filesys_flags)
got_ip = 1;
} else {
printf("ip address too long\n");
+ SAFE_FREE(out);
return 1;
}
} else if ((strncmp(data, "unc", 3) == 0)
@@ -511,6 +507,7 @@ static int parse_options(char ** optionsp, int * filesys_flags)
|| (strncmp(data, "path", 4) == 0)) {
if (!value || !*value) {
printf("invalid path to network resource\n");
+ SAFE_FREE(out);
return 1; /* needs_arg; */
} else if(strnlen(value,5) < 5) {
printf("UNC name too short");
@@ -525,6 +522,7 @@ static int parse_options(char ** optionsp, int * filesys_flags)
got_unc = 1;
} else if (strncmp(value, "\\\\", 2) != 0) {
printf("UNC Path does not begin with // or \\\\ \n");
+ SAFE_FREE(out);
return 1;
} else {
if(got_unc)
@@ -534,18 +532,21 @@ static int parse_options(char ** optionsp, int * filesys_flags)
}
} else {
printf("CIFS: UNC name too long\n");
+ SAFE_FREE(out);
return 1;
}
} else if ((strncmp(data, "domain", 3) == 0)
|| (strncmp(data, "workgroup", 5) == 0)) {
if (!value || !*value) {
printf("CIFS: invalid domain name\n");
+ SAFE_FREE(out);
return 1; /* needs_arg; */
}
if (strnlen(value, DOMAIN_SIZE+1) < DOMAIN_SIZE+1) {
got_domain = 1;
} else {
printf("domain name too long\n");
+ SAFE_FREE(out);
return 1;
}
} else if (strncmp(data, "cred", 4) == 0) {
@@ -554,10 +555,12 @@ static int parse_options(char ** optionsp, int * filesys_flags)
if(rc) {
printf("error %d (%s) opening credential file %s\n",
rc, strerror(rc), value);
+ SAFE_FREE(out);
return 1;
}
} else {
printf("invalid credential file name specified\n");
+ SAFE_FREE(out);
return 1;
}
} else if (strncmp(data, "uid", 3) == 0) {
@@ -596,6 +599,7 @@ static int parse_options(char ** optionsp, int * filesys_flags)
} else if (strcmp(data, "file_mode") == 0 || strcmp(data, "fmask")==0) {
if (!value || !*value) {
printf ("Option '%s' requires a numerical argument\n", data);
+ SAFE_FREE(out);
return 1;
}
@@ -610,6 +614,7 @@ static int parse_options(char ** optionsp, int * filesys_flags)
} else if (strcmp(data, "dir_mode") == 0 || strcmp(data, "dmask")==0) {
if (!value || !*value) {
printf ("Option '%s' requires a numerical argument\n", data);
+ SAFE_FREE(out);
return 1;
}
@@ -1407,48 +1412,57 @@ mount_retry:
printf("Refer to the mount.cifs(8) manual page (e.g.man mount.cifs)\n");
rc = EX_FAIL;
} else {
+ atexit(unlock_mtab);
+ rc = lock_mtab();
+ if (rc) {
+ printf("cannot lock mtab");
+ goto mount_exit;
+ }
pmntfile = setmntent(MOUNTED, "a+");
- if(pmntfile) {
- mountent.mnt_fsname = dev_name;
- mountent.mnt_dir = mountpoint;
- mountent.mnt_type = CONST_DISCARD(char *,"cifs");
- mountent.mnt_opts = (char *)malloc(220);
- if(mountent.mnt_opts) {
- char * mount_user = getusername();
- memset(mountent.mnt_opts,0,200);
- if(flags & MS_RDONLY)
- strlcat(mountent.mnt_opts,"ro",220);
- else
- strlcat(mountent.mnt_opts,"rw",220);
- if(flags & MS_MANDLOCK)
- strlcat(mountent.mnt_opts,",mand",220);
- if(flags & MS_NOEXEC)
- strlcat(mountent.mnt_opts,",noexec",220);
- if(flags & MS_NOSUID)
- strlcat(mountent.mnt_opts,",nosuid",220);
- if(flags & MS_NODEV)
- strlcat(mountent.mnt_opts,",nodev",220);
- if(flags & MS_SYNCHRONOUS)
- strlcat(mountent.mnt_opts,",synch",220);
- if(mount_user) {
- if(getuid() != 0) {
- strlcat(mountent.mnt_opts,",user=",220);
- strlcat(mountent.mnt_opts,mount_user,220);
- }
- /* free(mount_user); do not free static mem */
- }
- }
- mountent.mnt_freq = 0;
- mountent.mnt_passno = 0;
- rc = addmntent(pmntfile,&mountent);
- endmntent(pmntfile);
- SAFE_FREE(mountent.mnt_opts);
- if (rc)
- rc = EX_FILEIO;
- } else {
+ if (!pmntfile) {
printf("could not update mount table\n");
+ unlock_mtab();
rc = EX_FILEIO;
+ goto mount_exit;
}
+ mountent.mnt_fsname = dev_name;
+ mountent.mnt_dir = mountpoint;
+ mountent.mnt_type = CONST_DISCARD(char *,"cifs");
+ mountent.mnt_opts = (char *)malloc(220);
+ if(mountent.mnt_opts) {
+ char * mount_user = getusername();
+ memset(mountent.mnt_opts,0,200);
+ if(flags & MS_RDONLY)
+ strlcat(mountent.mnt_opts,"ro",220);
+ else
+ strlcat(mountent.mnt_opts,"rw",220);
+ if(flags & MS_MANDLOCK)
+ strlcat(mountent.mnt_opts,",mand",220);
+ if(flags & MS_NOEXEC)
+ strlcat(mountent.mnt_opts,",noexec",220);
+ if(flags & MS_NOSUID)
+ strlcat(mountent.mnt_opts,",nosuid",220);
+ if(flags & MS_NODEV)
+ strlcat(mountent.mnt_opts,",nodev",220);
+ if(flags & MS_SYNCHRONOUS)
+ strlcat(mountent.mnt_opts,",sync",220);
+ if(mount_user) {
+ if(getuid() != 0) {
+ strlcat(mountent.mnt_opts,
+ ",user=", 220);
+ strlcat(mountent.mnt_opts,
+ mount_user, 220);
+ }
+ }
+ }
+ mountent.mnt_freq = 0;
+ mountent.mnt_passno = 0;
+ rc = addmntent(pmntfile,&mountent);
+ endmntent(pmntfile);
+ unlock_mtab();
+ SAFE_FREE(mountent.mnt_opts);
+ if (rc)
+ rc = EX_FILEIO;
}
mount_exit:
if(mountpassword) {
diff --git a/source/client/mount.h b/source/client/mount.h
new file mode 100644
index 0000000..23ea4f0
--- /dev/null
+++ b/source/client/mount.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2008 Jeff Layton (jlayton at samba.org)
+ *
+ * This program is free software; you can redistribute it and/or modify
--
Samba Shared Repository
More information about the samba-cvs
mailing list