The branch, v3-0-stable has been updated
via 6a3362e13bf0613e86454d4f12b2b1b486e282fa (commit)
via 4cad817a8ed70df3db75a9d728414dfd7104ae1a (commit)
via 7f260289490635806cd8765e66e2b61ba6c098f2 (commit)
via adde5bcb0fa6a609bc2555ff4c51f837646f6b3b (commit)
via 2823322c5c0883887f693b0de7dfe8873237a877 (commit)
via 54e25e1fbfcb0141c866d9811da883b4f8197f43 (commit)
via d4febf79859acd19647a89e589f72588598509b2 (commit)
via f86dc6a0eaefbda0e83e2c25d5b553356fbf5ca8 (commit)
via 4d4943a762377b57d5d15b368315c6f35fabf44f (commit)
via 3df3c08071f690c8e9aca88da2eea8aed88473cd (commit)
via 746dde02c829adb56ca639f5a6e4d44be9468018 (commit)
via 568ef20412f4e2bf0872da5beb08fcbe1aa3fc5e (commit)
via 803aa8da6d2a7f32359a090062ab468cf8d6ce32 (commit)
via 09d7055c12e4a90eb74417ff37bb3359272607fd (commit)
via 9fe089291df30035974b750b4da7e6fa20b9c8a5 (commit)
via 3b6017fa7cae1a2cda488da0cc2dee7b08b63267 (commit)
via 41f8c6547298635adf990bd4db60e498d74d9fc4 (commit)
via d73ee18c15a1c1369b5a8c0ae88f6ec704d21404 (commit)
via 213581c68f67800858958ca79cb6de73fa57b507 (commit)
via 868ffe754db8ab59341c71b3cce2cd9600939185 (commit)
via 767f2dd0eb73f616351d54ea350b8b6de97334b9 (commit)
via 2a6f8e88150df48271fbe663b5702d725bcac3eb (commit)
via 99ad00efd7d3d0990ec20e0f278d63cf55167d0c (commit)
via b658c263e12077cde44a5cc8aa9cec0461115a95 (commit)
via 453ab3457a652d273a0c69f1408eac1e031695dd (commit)
via 1ee9e31a71ab7942bb2c38ce695e8ace1b4235ed (commit)
via dcbeddb3fad94eea4d623c13d4eb51b86f0f6fe3 (commit)
via 0be10db1016cb0a2fc2631840efd276377980798 (commit)
via ba1b99243c70807a49d2e6f14d9a31a029144ff8 (commit)
via 37d3a86f63b3c749a443720eaa5692a5ffb08b6c (commit)
via 27c0adceb1a9fe7a2ce310f105e244ecec477921 (commit)
via 335c3cdbd5d84d01d52fe4f8b823f3ecce9139f3 (commit)
via 51c9822b0cffeabd6cdd6b17e96e97dccc3c6517 (commit)
via 1da87f537554dc26563417d95bf5885630a336f4 (commit)
via bf2432428342c6702cf9ed0d38a34d8ff4ed0a36 (commit)
via a79fdce48072ae073375ac2b988e6c4f19be2dff (commit)
via 80cbbb5bd696f54b3af6e61b233ec0ebaaae63c4 (commit)
via fbe7ef5e77364aba41ac7e49de200103ef7cf9ec (commit)
via 2208d1311ce84a1714854d1e7b11cd22b0aa9ad1 (commit)
via b44feac63b819e0f67deaafd3151dfa3ff8ae1a5 (commit)
via 4d8e759e8f2f7dec0c9d0b3e59720bce30f60fb1 (commit)
via 9801f78c0b605f0063f0bdcd7afbac723504fd67 (commit)
via f20d4922ecabd99289c5fc624a2b8982cd36f971 (commit)
via 76a2c3bc1361466da5b63fa1f98b2091158768a1 (commit)
via b48bc3383f8a0d02b48a71143e0a8b29183bb394 (commit)
via bbf83dfc9ecf5e2f0018a9d2ba219b07563a5e27 (commit)
via 1ea39aee0e340038c67b83fc777278d34deee286 (commit)
via 50bac5bd91b94294cf2a7c74919cbf97d81292c7 (commit)
via 48d9974adf6cff6cc75821f4f62f1b20365b9780 (commit)
via 8aa2373eff1c9e3d72233e8809598d07f764cd1e (commit)
via 5069cd11a1897a6e314faf7eb095a5d2e405523e (commit)
via 8992deabb4977de46d049941ac3830c2bcef40e2 (commit)
from 857b6fb063b9968134cc664430ff5d33a992da4a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-stable
- Log -----------------------------------------------------------------
commit 6a3362e13bf0613e86454d4f12b2b1b486e282fa
Author: Karolin Seeger <ksee...@samba.org>
Date: Mon Jun 29 12:22:08 2009 +0200
VERSION: Raise version number up to 3.0.36.
Karolin
(cherry picked from commit d6c81c70c45348c86433dd64297e1a659535c155)
commit 4cad817a8ed70df3db75a9d728414dfd7104ae1a
Author: Volker Lendecke <v...@samba.org>
Date: Tue Jun 16 11:14:29 2009 +0200
Workaround for KB932762
(cherry picked from commit a15c816ba5fd4dcedd68beb1fcb0540de325c1cb)
commit 7f260289490635806cd8765e66e2b61ba6c098f2
Author: Karolin Seeger <ksee...@samba.org>
Date: Wed May 27 18:12:23 2009 +0200
s3/docs: Correct version number.
Karolin
(cherry picked from commit ccded3263ad1135cc707e24cc78d0fd95e2e88d3)
commit adde5bcb0fa6a609bc2555ff4c51f837646f6b3b
Author: Karolin Seeger <ksee...@samba.org>
Date: Mon May 4 15:17:30 2009 +0200
s3/docs: Fix typo.
Karolin
(cherry picked from commit c2eb0d87a2436614741119ebd14fda05b42a2ddd)
(cherry picked from commit 98c238a54dbe3e64262252a9fb38b382c53c1bcf)
(cherry picked from commit b118a70a9fc96e8ae5e51ebc8abc9076b07fdf27)
(cherry picked from commit 4d569a5bcdf7549daa5f8be7a7006c296f8a35ea)
commit 2823322c5c0883887f693b0de7dfe8873237a877
Author: Karolin Seeger <ksee...@samba.org>
Date: Sun May 3 09:55:46 2009 +0200
s3/docs: Fix typos.
That fixes bug #4247. Thanks to David McNeill <davemc [at] mcpond.co.nz>
for reporting!
Karolin
(cherry picked from commit eaf949947c2eb03363c4b6f588f87b70110d6ff7)
(cherry picked from commit cea79d1fbf44b0d5bff5aa12962fb3d3cb61c367)
(cherry picked from commit 226620d0ed221da983b4f662fcef14906588f1bd)
(cherry picked from commit e0eb78298e63c8dafbee9dea27a4e5f2150a4807)
commit 54e25e1fbfcb0141c866d9811da883b4f8197f43
Author: Karolin Seeger <ksee...@samba.org>
Date: Sun May 3 09:35:55 2009 +0200
s3/docs: Fix typo.
This fixes bug #4245. Thanks to David McNeill <davemc [at] mcpond.co.nz>
for reporting!
Karolin
(cherry picked from commit 579c91581f5b6d5341a12923fe6cde377223caff)
(cherry picked from commit 49caab4044e47236594c6688f202aed555b9da61)
(cherry picked from commit 139f95c85f96e7ccba024283608f9ee5990f6676)
(cherry picked from commit 148aa12c89df78718addd7b72c79a8005e680509)
(cherry picked from commit c36d3dae4740529427ea5ee5b77ad687de371d9c)
commit d4febf79859acd19647a89e589f72588598509b2
Author: Karolin Seeger <ksee...@samba.org>
Date: Wed Apr 29 14:12:01 2009 +0200
s3/docs: Fix serveral typos.
This fixes bug #4315.
Thanks to Felipe Augusto van de Wiel <faw [at] cathedrallabs [dot] org>!
Karolin
(cherry picked from commit 3422b9c546cdd262bd747e1e737c2b6479b4d21e)
(cherry picked from commit 3da62734fffa99cde1084beeb69e94a7bc623dde)
(cherry picked from commit b487a48c876fcaf88ec3fb4b05bacdd9b0bd8cd0)
(cherry picked from commit ccea7f24879265291615802982b67451ddb818ad)
(cherry picked from commit 3ba226109c01ee7f96be1592874aff4b930e2793)
commit f86dc6a0eaefbda0e83e2c25d5b553356fbf5ca8
Author: Jeremy Allison <j...@samba.org>
Date: Wed Apr 22 03:07:37 2009 -0700
Add comment explaining the previous fix. (and fix the previous patch :-).
By-hand merge error :-).
Jeremy.
(cherry picked from commit 869b56a24a1408ea798682b45f9c297341f88ad5)
commit 4d4943a762377b57d5d15b368315c6f35fabf44f
Author: Jeremy Allison <j...@samba.org>
Date: Wed Apr 22 02:55:47 2009 -0700
Fix bug #6279 - winbindd crash. Cope with LDAP libraries returning
LDAP_SUCCESS but not returning a result.
Jeremy
(cherry picked from commit 448d6cd32c793d04c3c509200bfaa75f466a0ee5)
commit 3df3c08071f690c8e9aca88da2eea8aed88473cd
Author: Günther Deschner <g...@samba.org>
Date: Mon Apr 6 12:45:46 2009 +0200
s3-examples: Fix Bug #6205. Correct sample smb.conf share configuration.
Thanks to Jeffrey Riaboy <daku...@castledragmire.com>.
Guenther
(cherry picked from commit 2b1fe2c98f4e0013dee4cbae62dc36cdd4085c7d)
(cherry picked from commit cb29ca98bb1c166ecd806e82c9d13865ae502a65)
commit 746dde02c829adb56ca639f5a6e4d44be9468018
Author: Bhaskar Jain (bhajain) <bhaj...@cisco.com>
Date: Fri Mar 20 08:11:30 2009 +0100
prevent segmentation fault on joining a very long domain name in
samba-3.0.32
For a detailed explanation, see
http://lists.samba.org/archive/samba-technical/2009-March/063626.html
(cherry picked from commit a92280537071b5a9a9bc56fbeead14c6874d5a55)
commit 568ef20412f4e2bf0872da5beb08fcbe1aa3fc5e
Author: Jeremy Allison <j...@samba.org>
Date: Thu Mar 5 21:51:26 2009 -0800
Get the sense of the integer wrap test the right way around. Sorry.
Jeremy.
(cherry picked from commit bdf46ea491801cdf8ff6f42c0a1ef51080cfc410)
commit 803aa8da6d2a7f32359a090062ab468cf8d6ce32
Author: Jeremy Allison <j...@samba.org>
Date: Thu Mar 5 20:59:48 2009 -0800
Now we're allowing a lower bound for auth_len, ensure we
also check for an upper one (integer wrap).
Jeremy.
(cherry picked from commit f03bacbf695f877d27186a39755ae726a22a61c8)
commit 09d7055c12e4a90eb74417ff37bb3359272607fd
Author: Volker Lendecke <v...@samba.org>
Date: Thu Mar 5 15:14:27 2009 -0800
Complete the fix for bug 6100
According to [MS-RPCE].pdf, section 2.2.2.11:
----
A client or a server that (during composing of a PDU) has allocated more
space
for the authentication token than the security provider fills in SHOULD
fill in
the rest of the allocated space with zero octets. These zero octets are
still
considered to belong to the authentication token part of the PDU.<36>
----
RPC implementations are allowed to send padding bytes at the end of an auth
footer. Windows 7 makes use of this.
Thanks to Nick Meier <nme...@microsoft.com>
Volker
(cherry picked from commit 7274d5691a339087f2770acf2f954830506f5cdc)
commit 9fe089291df30035974b750b4da7e6fa20b9c8a5
Author: Jeremy Allison <j...@samba.org>
Date: Wed Feb 25 13:01:04 2009 -0800
Fix bug in processing of open modes in POSIX open.
Was missing case of "If file exists open. If file doesn't exist error."
Damn damn damn. CIFSFS client will have to have fallback cases
for this error for a long time.
Make test for open modes more robust against other bits.
Jeremy.
(cherry picked from commit ac11d94f36e1878f3f5d86f2e7197fd8ecdd196b)
commit 3b6017fa7cae1a2cda488da0cc2dee7b08b63267
Author: Steve French <smfre...@gmail.com>
Date: Tue Feb 24 17:11:55 2009 -0600
Fix guest mounts
guest session setup, login (user id) as anonymous.
This patch is for samba bugzilla bug 4640.
Signed-off-by: Shirish Pargaonkar <shiri...@us.ibm.com>
Acked-by: Jeff Layton <jlay...@redhat.com>
Signed-off-by: Steve French <sfre...@samba.org>
(cherry picked from commit a8f10f4469b31565e33669560657c2b3df68c13b)
commit 41f8c6547298635adf990bd4db60e498d74d9fc4
Author: Steve French <smfre...@gmail.com>
Date: Tue Feb 24 14:40:59 2009 -0600
Fix mount.cifs handling of -V option (to display version)
Also sync with current mount.cifs
Acked-by: Jeff Layton <jlay...@redhat.com>
Signed-off-by: Steve French <sfre...@samba.org>
(cherry picked from commit 510619be1897f1610d1a033c4e318002e077fdb2)
commit d73ee18c15a1c1369b5a8c0ae88f6ec704d21404
Author: Björn Jacke <b...@sernet.de>
Date: Sun Feb 22 19:46:40 2009 +0100
prefer gssapi header files from subdirectory
this fixes some compile time noise on FreeBSD 7
(cherry picked from commit 1bfdbb093f7c5e434ea3e653d389e1ccec578af6)
(cherry picked from commit de96e1a82d6e92c00a0ab3020db8d7c0284aadb1)
(cherry picked from commit b4fc28ddffa4f9a74ca72ee6c2d30f544de5360c)
commit 213581c68f67800858958ca79cb6de73fa57b507
Author: Karolin Seeger <ksee...@samba.org>
Date: Mon Feb 23 09:24:50 2009 +0100
s3/docs: Fix typo in man mount.cifs.
Thanks to Tobias Stoeckmann for reporting!
Karolin
(cherry picked from commit 09a7f93f6be66a8f2a124e49b4effe2b5863f01d)
(cherry picked from commit fdb5c65fc51784b6a159748ec4df3953b7d2c1cb)
(cherry picked from commit b19f58ccd088a10e487a1261cadb4f3f41987391)
(cherry picked from commit eebc7e7ff0e6580b55ca0964a1f38096e11caa78)
commit 868ffe754db8ab59341c71b3cce2cd9600939185
Author: Jeremy Allison <j...@samba.org>
Date: Sun Feb 15 18:23:09 2009 -0800
Attempt to fix bug #6099. According to Microsoft
Windows 7 looks at the negotiate_flags
returned in this structure *even if the
call fails with access denied ! So in order
to allow Win7 to connect to a Samba NT style
PDC we set the flags before we know if it's
an error or not.
Jeremy.
(cherry picked from commit 194fdee65f91e8ea88196d2cff1c678f868bb3df)
commit 767f2dd0eb73f616351d54ea350b8b6de97334b9
Author: Jeremy Allison <j...@samba.org>
Date: Fri Feb 13 14:59:48 2009 -0800
Noted by Vericode analysis. Correctly use chroot().
Jeremy.
(cherry picked from commit 3086400b61ee3dda639c5520b539d4ff76e4d9c5)
commit 2a6f8e88150df48271fbe663b5702d725bcac3eb
Author: Yasuma Takeda <yas...@osstech.co.jp>
Date: Wed Feb 11 14:10:21 2009 -0800
Fix bug #6098 - When the DNS server is invalid, the ads_find_dc() does not
work correctly with "security = domain"
1. If DNS server is invalid, the get_sorted_dc_list() is called with
realm(FQDN) and it fails.
2. On the next step, the get_sorted_dc_list() is called with realm(FQDN)
again.
I think "again" is wrong place.
On the 2nd step, get_sorted_dc_list() should be called with
realm(WORKGROUP).
(cherry picked from commit 58331a118dd6a7fb56e70afe6cf93ef7cfff7e81)
commit 99ad00efd7d3d0990ec20e0f278d63cf55167d0c
Author: Jeremy Allison <j...@samba.org>
Date: Wed Feb 11 11:35:51 2009 -0800
Fix bug #5906 - Winbindd crash on 'getent group' (INTERNAL ERROR: Signal
11).
Was missed in the last maintenence release.
Jeremy.
(cherry picked from commit db4a435d235bedf48d668a0f4418dd46f38044ed)
commit b658c263e12077cde44a5cc8aa9cec0461115a95
Author: Shirish Pargaonkar <shirishpargaon...@gmail.com>
Date: Fri Feb 6 08:23:52 2009 -0500
mount.cifs: add fakemount (-f) and nomtab (-n) flags to mount.cifs
...so that these options work correctly when passed in by mount(8).
(cherry picked from commit a894bd4504f070233dd2785a62483090581f5bf3)
commit 453ab3457a652d273a0c69f1408eac1e031695dd
Author: Michael Adam <ob...@samba.org>
Date: Thu Feb 5 22:19:58 2009 +0100
docs: fix two typos in the mount.cifs manpage
Michael
(cherry picked from commit 145fe37766cf1ecffb16a03b58b44d08f7ed7558)
Signed-off-by: Michael Adam <ob...@samba.org>
(cherry picked from commit 45699a287d27cce24e883384a72441d310c8ee28)
commit 1ee9e31a71ab7942bb2c38ce695e8ace1b4235ed
Author: Günter Kukkukk <li...@kukkukk.com>
Date: Thu Feb 5 19:48:58 2009 -0800
Don't try and delete a default ACL from a file.
(cherry picked from commit 04fc826efb290ba4b1f173752efb37a4b87281f2)
commit dcbeddb3fad94eea4d623c13d4eb51b86f0f6fe3
Author: Shirish Pargaonkar <shirishpargaon...@gmail.com>
Date: Thu Feb 5 14:18:36 2009 -0500
umount.cifs: clean-up entries in /etc/mtab after unmount
This patch removes the remaining entry in /etc/mtab after a filesystem
is unmounted by canonicalizing the mountpoint supplied on the command
line.
Please refer to bug 4370 in samba bugzilla.
(cherry picked from commit df341bd2b83cc67e31d5b91ae39b4f4f7619ffd0)
commit 0be10db1016cb0a2fc2631840efd276377980798
Author: Miguel Suarez <miguel.sua...@stratus.com>
Date: Tue Feb 3 14:31:51 2009 -0800
Fix bug #6085 - In vfs_default.c change utime( ) call.
(cherry picked from commit 7a1408f89f1addff993d1e2dfb7462d12d0a2f48)
commit ba1b99243c70807a49d2e6f14d9a31a029144ff8
Author: Ted Percival <ted.perci...@quest.com>
Date: Tue Feb 3 14:10:20 2009 -0800
Probably fixes a crash during name resolution when log level >= 10
and libc segfaults if printf is passed NULL for a "%s" arg
(eg. Solaris).
(cherry picked from commit d3220d9d58477f2a6ef7a78c3cf05cb232b57aff)
commit 37d3a86f63b3c749a443720eaa5692a5ffb08b6c
Author: Lars Müller <l...@samba.org>
Date: Mon Feb 2 21:38:38 2009 +0100
Adjust regex to match variable names including underscores
This is required to get the CIFSUPCALL_PROGS setting extracted from
config.log.
(cherry picked from commit dbfdfd047e8e69942b3289733d300d716cdbec53)
commit 27c0adceb1a9fe7a2ce310f105e244ecec477921
Author: Lars Müller <l...@samba.org>
Date: Mon Feb 2 21:12:52 2009 +0100
Conditional install of the cifs.upcall man page
Only install the cifs.upcall man page if CIFSUPCALL_PROGS was set while
configure.
(cherry picked from commit fda450e4d6f9d2661235a3422c0db644a6c686b3)
commit 335c3cdbd5d84d01d52fe4f8b823f3ecce9139f3
Author: Günther Deschner <g...@samba.org>
Date: Fri Sep 5 14:01:45 2008 +0200
build: don't install the cifs.upcall binary twice.
Guenther
(cherry picked from commit 5202fa31b227d8dd9a3ddfab26f7933bfd349281)
commit 51c9822b0cffeabd6cdd6b17e96e97dccc3c6517
Author: Karolin Seeger <ksee...@samba.org>
Date: Mon Feb 2 11:46:39 2009 +0100
docs: Describe "service" in man mount.cifs.
This fixes bug #5346.
Thanks to the Debian Samba package maintainers for reporting and providing a
patch!
Karolin
(cherry picked from commit 73f4fc1f802f31459b70dba4777d142d00fcdd92)
(cherry picked from commit ab4768452811e67f6606253b5a79101184f777d0)
(cherry picked from commit 876b0b001976226a7c1887570c08178d72842a48)
(cherry picked from commit 72655775487617e2f76836a7b16bee81e430f6f1)
commit 1da87f537554dc26563417d95bf5885630a336f4
Author: Michael Adam <ob...@samba.org>
Date: Tue Jan 27 15:52:03 2009 +0100
libreplace: fix detection of netinet/ip.h on solaris 8
(The test needs to additionally include <netinet/in_systm.h>.)
Michael
(cherry picked from commit 1868bfd40f7bf4caf9a31116111fa3a5169f4735)
commit bf2432428342c6702cf9ed0d38a34d8ff4ed0a36
Author: Michael Adam <ob...@samba.org>
Date: Tue Jan 27 12:37:13 2009 +0100
libreplace: fix bug #6066 - netinet/ip.h present but cannot be compiled
under solaris
Michael
(cherry picked from commit d09c9b459638242b9df53cc82a8849699d572486)
commit a79fdce48072ae073375ac2b988e6c4f19be2dff
Author: Michael Adam <ob...@samba.org>
Date: Wed Jan 21 15:10:10 2009 +0100
build-docs: cleanup exit of the script
exit in the directory where it was called using pushd/popd.
Michael
(cherry picked from commit b319549f129b1c79afc9bfd4a84f2730b96d69a3)
Signed-off-by: Michael Adam <ob...@samba.org>
(cherry picked from commit 84433b32a9339662ddad9443b90beafdcd8a2044)
commit 80cbbb5bd696f54b3af6e61b233ec0ebaaae63c4
Author: Michael Adam <ob...@samba.org>
Date: Wed Jan 21 15:09:46 2009 +0100
s3:docs: clean build/catalog.xml in "make clean"
Michael
(cherry picked from commit 5e21fc3506f2ba7b1135b1acad2697dfb86b5df0)
Signed-off-by: Michael Adam <ob...@samba.org>
(cherry picked from commit 12116d757e2d9e3472dcccecc83ba77e09767d52)
commit fbe7ef5e77364aba41ac7e49de200103ef7cf9ec
Author: Michael Adam <ob...@samba.org>
Date: Wed Jan 21 15:09:12 2009 +0100
s3:docs: clean generated .png images in "make clean"
Michael
(cherry picked from commit 9b32e839bec8611c30745607a3a6b124d5b34c01)
Signed-off-by: Michael Adam <ob...@samba.org>
(cherry picked from commit c6c1ab779c50c24c362132d4a5f26bee198a8a1a)
commit 2208d1311ce84a1714854d1e7b11cd22b0aa9ad1
Author: Michael Adam <ob...@samba.org>
Date: Wed Jan 21 11:47:46 2009 +0100
s3:docs: fix ommission in fix of (real)distclean targets
Michael
(cherry picked from commit 37412017c5dd2f05a7f4bbe0410a6e00ce4805e5)
Signed-off-by: Michael Adam <ob...@samba.org>
(cherry picked from commit 892ab9ce709a478fad31f552a70a4b5992a386ed)
commit b44feac63b819e0f67deaafd3151dfa3ff8ae1a5
Author: Michael Adam <ob...@samba.org>
Date: Wed Jan 21 11:45:23 2009 +0100
s3:create-tarball: also include the VENDOR_PATCH in the version
Michael
(cherry picked from commit ce3e34d37ce5592e0268be5d16240387d971585a)
Signed-off-by: Michael Adam <ob...@samba.org>
(cherry picked from commit 347cc7f911cdbbe04aa3254444f7060cb0d2038e)
commit 4d8e759e8f2f7dec0c9d0b3e59720bce30f60fb1
Author: Michael Adam <ob...@samba.org>
Date: Wed Jan 21 11:41:14 2009 +0100
s3:docs: fix distclean target and add realdistclean target
- remove stuff created by configure in distclean
- remove stuff created by autoconf in realdistclean
Michael
(cherry picked from commit 65c92fea3d18c3520ff2a1e53a0c5c8825c9788f)
Signed-off-by: Michael Adam <ob...@samba.org>
(cherry picked from commit 4976a8737700aff1772126375b60566046f29ec4)
commit 9801f78c0b605f0063f0bdcd7afbac723504fd67
Author: Jelmer Vernooij <jel...@samba.org>
Date: Tue May 27 18:40:14 2008 +0200
Depend on latexfigures files directly as using a rule in between causes
problems.
(This used to be commit bf3c2773f94c1db29a8a3e5935ff587f16f9a905)
(cherry picked from commit 5f6d0078d41e790ab4fa7dac15294821cdb4d4f0)
Signed-off-by: Michael Adam <ob...@samba.org>
(cherry picked from commit c52786ee1c37139b9d2f7041fcc858cdd0c6e8f3)
commit f20d4922ecabd99289c5fc624a2b8982cd36f971
Author: Jelmer Vernooij <jel...@samba.org>
Date: Wed May 21 17:55:20 2008 +0200
Use double colon targets.
(This used to be commit 825cf91fa8b30a67d04cbda8885ff62a4c26458f)
(cherry picked from commit 323be4a6907e4915bb76aa103bf5b868f0b459b1)
Signed-off-by: Michael Adam <ob...@samba.org>
(cherry picked from commit 9894ba47fa0d75bf0b9b2993eb6115a33e39ce9c)
commit 76a2c3bc1361466da5b63fa1f98b2091158768a1
Author: Jelmer Vernooij <jel...@samba.org>
Date: Fri May 16 15:46:36 2008 +0200
Add test target in Makefile.
(This used to be commit ac0d768676b1b8105a9141169b1afa248df6ce66)
(cherry picked from commit 0f3ba4b766ed83d2a38e6cae8db8690374d88989)
Signed-off-by: Michael Adam <ob...@samba.org>
(cherry picked from commit f430afc9c78178184601b08ea3e2efd5b1db761c)
commit b48bc3383f8a0d02b48a71143e0a8b29183bb394
Author: Jelmer Vernooij <jel...@samba.org>
Date: Fri May 16 15:31:54 2008 +0200
Make the make output a bit less chatty.
(This used to be commit 1fa4ef553c437bae07389c0f6a5410ba22ee4905)
(cherry picked from commit 70f52c06ba1d0d9638f1dfb8c42cd0d70364e9df)
Signed-off-by: Michael Adam <ob...@samba.org>
(cherry picked from commit 4591c073be8feb767764aaa4030d6f23ea4a07db)
commit bbf83dfc9ecf5e2f0018a9d2ba219b07563a5e27
Author: Andreas Schneider <anschnei...@suse.de>
Date: Mon Jan 26 14:38:34 2009 +0100
Document default of the printing config variable.
Signed-off-by: Andreas Schneider <anschnei...@suse.de>
(cherry picked from commit d8f15e4efc00b9d509ff5761e9ca8ff5c6f443f7)
(cherry picked from commit 541704e253f06f8b33006b6c27f51b934c2eb51f)
(cherry picked from commit 69880dac28ac1681bb0c3d84280494de3d788cc6)
(cherry picked from commit c2d30b0a8e3609854908aeff19174e8e4e291cb7)
(cherry picked from commit ab3e06e58b3b82377621262002837a63429ef87d)
commit 1ea39aee0e340038c67b83fc777278d34deee286
Author: Karolin Seeger <ksee...@samba.org>
Date: Fri Jan 23 13:02:46 2009 +0100
docs: Fix formatting issue in man libsmbclient.
Karolin
(cherry picked from commit aa2fb0efb7ce2bc732569b4baf20c57375fdce59)
(cherry picked from commit e1e3a0554fcaabacc5bec51c213622271a83ad04)
(cherry picked from commit 84237fb48aad5f11789d75a6767a6f47465f140b)
(cherry picked from commit 2d4997f9bb7aa7b99c384defe6c7766d5169653d)
commit 50bac5bd91b94294cf2a7c74919cbf97d81292c7
Author: Jeremy Allison <j...@samba.org>
Date: Thu Jan 22 16:29:46 2009 -0800
Apply same logic fix for #4308 Excel save operation corrupts file ACLs
to NFSv4 ACL code as this uses the same flawed logic as posix_acls.c.
Jeremy.
(cherry picked from commit 11fbc11e396a300aed04a37d44411d287d4c17d3)
commit 48d9974adf6cff6cc75821f4f62f1b20365b9780
Author: Jeremy Allison <j...@samba.org>
Date: Thu Jan 22 16:04:36 2009 -0800
Fix logic error in try_chown - we shouldn't arbitrarily chown
to ourselves unless that was passed in.
Jeremy.
(cherry picked from commit 60289187a91e23787be581b824076651230245b2)
commit 8aa2373eff1c9e3d72233e8809598d07f764cd1e
Author: Jeremy Allison <j...@samba.org>
Date: Thu Jan 22 14:31:27 2009 -0800
Second part of the attemt to fix #4308 - Excel save operation corrupts file
ACLs.
If the chown succeeds then the ACL set should also. Ensure this is the case
(refactor some of this code to make it simpler to read also).
Jeremy.
(cherry picked from commit 08836722e63cfd6cfd88059dd3f10d98474f49cb)
commit 5069cd11a1897a6e314faf7eb095a5d2e405523e
Author: Jeremy Allison <j...@samba.org>
Date: Thu Jan 22 10:58:38 2009 -0800
Another attempt to fix bug #4308 - Excel save operation corrupts file ACLs.
Simo is completely correct. We should be doing the chown *first*, and fail
the
ACL set if this fails. The long standing assumption I made when writing the
initial POSIX ACL code was that Windows didn't control who could chown a
file
in the same was as POSIX. In POSIX only root can do this whereas I wasn't
sure
who could do this in Windows at the time (I didn't understand the privilege
model). So the assumption was that setting the ACL was more important (early
tests showed many failed ACL set's due to inability to chown). But now we
have
privileges in smbd, and we must always fail an ACL set when we can't chown
first. The key that Simo noticed is that the CREATOR_OWNER bits in the ACL
incoming are relative to the *new* owner, not the old one. This is why the
old
user owner disappears on ACL set - their access was set via the USER_OBJ in
the
creator POSIX ACL and when the ownership changes they lose their access.
Patch is simple - just ensure we do the chown first before evaluating the
incoming ACL re-read the owners. We already have code to do this it just
wasn't
rigorously being applied.
Jeremy.
(cherry picked from commit 9a95b6cac2dea88cb9e9b428292dfca9d1e3e801)
commit 8992deabb4977de46d049941ac3830c2bcef40e2
Author: Karolin Seeger <ksee...@samba.org>
Date: Wed Jan 21 11:37:30 2009 +0100
build_docs: Use 'make distclean' instead of 'make clean'.
This fixes bug #6058.
Thanks to Christian Perrier for reporting!
Karolin
(cherry picked from commit 162e4b66601b41dd5adb24e192f3b5a91dfb41cc)
(cherry picked from commit 2545fcc48888628eef2d6b83ef5656be1e53bf7e)
(cherry picked from commit 0098eb45d99373a4d1945e61dda24ea282c377e7)
-----------------------------------------------------------------------
Summary of changes:
docs-xml/Makefile | 82 ++--
.../Samba3-ByExample/SBE-KerberosFastStart.xml | 4 +-
docs-xml/Samba3-HOWTO/TOSHARG-Install.xml | 9 +-
docs-xml/Samba3-HOWTO/TOSHARG-Passdb.xml | 10 +-
docs-xml/Samba3-HOWTO/TOSHARG-foreword-cargill.xml | 2 +-
docs-xml/Samba3-HOWTO/index.xml | 2 +-
docs-xml/manpages-3/libsmbclient.7.xml | 7 +-
docs-xml/manpages-3/mount.cifs.8.xml | 17 +-
docs-xml/smbdotconf/printing/printing.xml | 2 +
examples/smb.conf.default | 2 +-
release-scripts/build-docs | 22 +-
release-scripts/create-tarball | 4 +
source/Makefile.in | 2 +-
source/VERSION | 2 +-
source/client/mount.cifs.c | 437 +++++++++++---------
source/client/umount.cifs.c | 34 ++-
source/include/includes.h | 6 +-
source/lib/replace/libreplace.m4 | 9 +-
source/libaddns/dns.h | 6 +-
source/libads/cldap.c | 2 +-
source/libads/ldap.c | 15 +-
source/libsmb/namequery.c | 2 +-
source/modules/nfs4_acls.c | 79 ++--
source/modules/vfs_default.c | 2 +-
source/nsswitch/winbindd_passdb.c | 4 +-
source/nsswitch/wins.c | 82 +++-
source/rpc_server/srv_netlog_nt.c | 27 +-
source/rpc_server/srv_pipe.c | 6 +-
source/script/installman.sh | 3 +-
source/smbd/lanman.c | 4 +-
source/smbd/posix_acls.c | 314 +++++++-------
source/smbd/server.c | 11 +-
source/smbd/trans2.c | 2 +
33 files changed, 693 insertions(+), 519 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 0f401d6..610d720 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -50,49 +50,56 @@ $(DOCBOOKDIR)/Samba3-Developers-Guide.xml: $(filter-out
Samba3-Developers-Guide/
$(DOCBOOKDIR)/Samba4-HOWTO.xml: $(filter-out Samba4-HOWTO/index.xml,$(wildcard
Samba4-HOWTO/*.xml)) Samba4-HOWTO-attributions.xml
# Pseudo targets
-all: $(TARGETS)
-everything: manpages3 pdf html-single html htmlman3 txt ps fo htmlhelp pearson
-release: manpages3 htmlman3 html pdf
-clean:
+all:: $(TARGETS)
+everything:: manpages3 pdf html-single html htmlman3 txt ps fo htmlhelp
pearson
+release:: manpages3 htmlman3 html pdf
+clean::
@echo "Cleaning up..."
rm -rf $(OUTPUTDIR)/* $(DOCBOOKDIR)
rm -f $(patsubst %.svg,%.png,$(foreach
DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia))) \
$(patsubst %.svg,%.pdf,$(foreach
DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) \
- $(patsubst %.svg,%.eps,$(foreach
DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg)))
+ $(patsubst %.svg,%.eps,$(foreach
DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) \
+ $(patsubst %.svg,%.png,$(foreach
DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg)))
rm -f *-attributions.xml *.d *.tpt *.tex *.loc *.toc *.lof *.glo *.idx
*.aux
rm -f *-images-html*
- rm -f *-images-latex-* latexfigures
+ rm -f *-images-latex-* $(LATEX_FIGURES)
rm -f xslt/figures/*pdf
rm -f $(SMBDOTCONFDOC)/parameters.*.xml
rm -f $(addsuffix .*,$(MAIN_DOCS))
+ rm -f build/catalog.xml
# Output format targets
-pdf: $(patsubst %,$(PDFDIR)/%.pdf,$(MAIN_DOCS))
-dvi: $(patsubst %,$(DVIDIR)/%.dvi,$(MAIN_DOCS))
-ps: $(patsubst %,$(PSDIR)/%.ps,$(MAIN_DOCS))
-txt: $(patsubst %,$(TXTDIR)/%.txt,$(MAIN_DOCS))
-txt-chunks: $(addsuffix -txt-chunks,$(MAIN_DOCS))
-fo: $(patsubst %,$(FODIR)/%.fo,$(MAIN_DOCS))
-fo-pdf: $(patsubst %,$(FOPDFDIR)/%.pdf,$(MAIN_DOCS))
-tex: $(addsuffix .tex,$(MAIN_DOCS))
-texi: $(patsubst %,$(TEXINFODIR)/%.texi,$(MAIN_DOCS))
-texiinfo: $(patsubst %,$(TEXINFODIR)/%.info,$(MAIN_DOCS))
-manpages3: $(patsubst
$(MANPAGEDIR3)/%.xml,$(OUTPUTDIR)/manpages-3/%,$(MANPAGES3))
-pearson: $(PEARSONDIR)/Samba3-HOWTO.xml
-pearson-verify: $(PEARSONDIR)/Samba3-HOWTO.report.html
-plucker: $(patsubst %,$(PLUCKERDIR)/%.pdb,$(MAIN_DOCS))
-htmlman3: $(patsubst
$(MANPAGEDIR3)/%.xml,$(HTMLDIR)/manpages-3/%.html,$(MANPAGES3))
$(HTMLDIR)/manpages-3/index.html
-html-single: $(patsubst %,$(HTMLDIR)/%.html,$(MAIN_DOCS))
-html: $(patsubst %,$(HTMLDIR)/%/index.html,$(MAIN_DOCS)) $(HTMLDIR)/index.html
-htmlhelp: $(addprefix $(HTMLHELPDIR)/,$(MAIN_DOCS))
-validate: $(addsuffix -validate,$(MAIN_DOCS))
+pdf:: $(patsubst %,$(PDFDIR)/%.pdf,$(MAIN_DOCS))
+dvi:: $(patsubst %,$(DVIDIR)/%.dvi,$(MAIN_DOCS))
+ps:: $(patsubst %,$(PSDIR)/%.ps,$(MAIN_DOCS))
+txt:: $(patsubst %,$(TXTDIR)/%.txt,$(MAIN_DOCS))
+txt-chunks:: $(addsuffix -txt-chunks,$(MAIN_DOCS))
+fo:: $(patsubst %,$(FODIR)/%.fo,$(MAIN_DOCS))
+fo-pdf:: $(patsubst %,$(FOPDFDIR)/%.pdf,$(MAIN_DOCS))
+tex:: $(addsuffix .tex,$(MAIN_DOCS))
+texi:: $(patsubst %,$(TEXINFODIR)/%.texi,$(MAIN_DOCS))
+texiinfo:: $(patsubst %,$(TEXINFODIR)/%.info,$(MAIN_DOCS))
+manpages3:: $(patsubst
$(MANPAGEDIR3)/%.xml,$(OUTPUTDIR)/manpages-3/%,$(MANPAGES3))
+pearson:: $(PEARSONDIR)/Samba3-HOWTO.xml
+pearson-verify:: $(PEARSONDIR)/Samba3-HOWTO.report.html
+plucker:: $(patsubst %,$(PLUCKERDIR)/%.pdb,$(MAIN_DOCS))
+htmlman3:: $(patsubst
$(MANPAGEDIR3)/%.xml,$(HTMLDIR)/manpages-3/%.html,$(MANPAGES3))
$(HTMLDIR)/manpages-3/index.html
+html-single:: $(patsubst %,$(HTMLDIR)/%.html,$(MAIN_DOCS))
+html:: $(patsubst %,$(HTMLDIR)/%/index.html,$(MAIN_DOCS)) $(HTMLDIR)/index.html
+htmlhelp:: $(addprefix $(HTMLHELPDIR)/,$(MAIN_DOCS))
+validate:: $(addsuffix -validate,$(MAIN_DOCS))
+
+test:: validate
+check:: validate
+
+.PHONY: test check validate
# Intermediate docbook docs
#
$(DOCBOOKDIR)/%.xml: %/index.xml xslt/expand-sambadoc.xsl
@echo "Converting Samba-specific tags for $*..."
@mkdir -p $(@D)
- $(XSLTPROC) --stringparam latex.imagebasedir "$*/" --stringparam
noreference 0 --xinclude --output $@ xslt/expand-sambadoc.xsl $<
+ @$(XSLTPROC) --stringparam latex.imagebasedir "$*/" --stringparam
noreference 0 --xinclude --output $@ xslt/expand-sambadoc.xsl $<
$(DOCBOOKDIR)/manpages-3/%.xml: $(MANPAGEDIR3)/%.xml xslt/expand-sambadoc.xsl
@mkdir -p $(@D)
@@ -105,7 +112,6 @@ $(DOCBOOKDIR)/manpages-3/index.xml: $(MANPAGES3)
xslt/manpage-summary.xsl
@echo "</variablelist></article>" >> $@
# HTML docs
-
$(HTMLDIR)/index.html: htmldocs.html
@mkdir -p $(@D)
cp $< $@
@@ -128,7 +134,7 @@ $(HTMLDIR)/%.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/samba.css
xslt/html.xsl
%-attributions.xml:
@echo "Generating attributions file $@ from $*/"
@cp -f templates/attributions.xml $@
- $(XSLTPROC) --xinclude -o $@ xslt/generate-attributions.xsl
$*/index.xml
+ @$(XSLTPROC) --xinclude -o $@ xslt/generate-attributions.xsl
$*/index.xml
# Text files
$(TXTDIR)/%.txt: $(HTMLDIR)/%.html
@@ -139,15 +145,13 @@ $(TXTDIR)/%.txt: $(HTMLDIR)/%.html
%.tex: %/index.xml xslt/latex.xsl
@echo "Generating $...@..."
@mkdir -p $(@D)
- $(XSLTPROC) $(DB2LATEX_ARGS) --stringparam latex.imagebasedir "$*/"
--xinclude --output $@ xslt/latex.xsl $<
-
-latexfigures: $(LATEX_FIGURES)
+ @$(XSLTPROC) $(DB2LATEX_ARGS) --stringparam latex.imagebasedir "$*/"
--xinclude --output $@ xslt/latex.xsl $<
$(PDFDIR)/%.pdf: %.pdf
@mkdir -p $(@D)
cp $< $@
-%.idx: %.tex latexfigures
+%.idx: %.tex $(LATEX_FIGURES)
-$(PDFLATEX) $<
%.ind: %.idx
@@ -156,8 +160,7 @@ $(PDFDIR)/%.pdf: %.pdf
# Dependency files
%.d: $(DOCBOOKDIR)/%.xml xslt/generate-dependencies.xsl
@echo "Generating dependency file for $*"
- $(XSLTPROC) \
- --novalid \
+ @$(XSLTPROC) --novalid \
--stringparam txtbasedir "$(TXTDIR)/$*/" \
--stringparam target "$*" \
-o $@ xslt/generate-dependencies.xsl $<
@@ -190,7 +193,7 @@ endif
endif
# Adobe PDF files
-%.pdf: %.tex %.ind latexfigures %-images-latex-png %-images-latex-pdf
+%.pdf: %.tex %.ind $(LATEX_FIGURES) %-images-latex-png %-images-latex-pdf
-$(PDFLATEX) $<
-$(PDFLATEX) $<
-$(PDFLATEX) $<
@@ -318,12 +321,15 @@ xslt/generate-attributions.xsl:
xslt/man.xsl:
xslt/pearson.xsl:
-distclean clobber: clean
- rm Makefile.settings config.status config.log configure
+distclean clobber:: clean
+ rm -f Makefile.settings config.status config.log
+
+realdistclean:: distclean
+ rm -f configure
rm -rf autom4te.cache
# Always keep intermediate files if we can
.SECONDARY:
-.PHONY: clean clobber archive release everything all $(TARGETS) latexfigures
+.PHONY: clean clobber archive release everything all
diff --git a/docs-xml/Samba3-ByExample/SBE-KerberosFastStart.xml
b/docs-xml/Samba3-ByExample/SBE-KerberosFastStart.xml
index b593eed..7f2ac4b 100644
--- a/docs-xml/Samba3-ByExample/SBE-KerberosFastStart.xml
+++ b/docs-xml/Samba3-ByExample/SBE-KerberosFastStart.xml
@@ -1368,8 +1368,10 @@
<orderedlist>
<listitem><para>
- A user opens a Work document from a network drive. The file was
owned by user <constant>janetp</constant>
+ A user opens a Word document from a network drive. The file was
owned by user <constant>janetp</constant>
and <group>users</group>, and was set read/write-enabled for
everyone.
+ A user opens a Word document from a network drive. The file was
owned by user <constant>janetp</constant>
+ and <constant>users</constant>, and was set read/write-enabled
for everyone.
</para></listitem>
<listitem><para>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-Install.xml
b/docs-xml/Samba3-HOWTO/TOSHARG-Install.xml
index 9894ed2..c0ffc05 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-Install.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-Install.xml
@@ -467,7 +467,7 @@
and thus the need to keep this file small goes against good
documentation wisdom. One solution that may
be adopted is to do all documentation and configuration in a file that
has another name, such as
<filename>smb.conf.master</filename>. The <command>testparm</command>
utility can be used to generate a
- fully optimized &smb.conf; file from this master configuration and
documtenation file as shown here:
+ fully optimized &smb.conf; file from this master configuration and
documentation file as shown here:
<screen>
&rootprompt; testparm -s smb.conf.master > smb.conf
</screen>
@@ -484,8 +484,7 @@
<para>
<indexterm><primary>swat</primary></indexterm>
SWAT is a Web-based interface that can be used to facilitate the
configuration of Samba. SWAT might not
- be available in the Samba package that shipped with your platform, but
in a separate package. If it is
- necesaary to built SWAT please read the SWAT man page regarding
compilation, installation, and
+ be available in the Samba package that shipped with your platform, but
in a separate package. If you need to build SWAT please read the SWAT man page
regarding compilation, installation, and
configuration of SWAT from the source code.
</para>
@@ -498,10 +497,12 @@
<para>
SWAT can be used from a browser on any IP-connected machine, but be
aware that connecting from a remote
- machine leaves your connection open to password sniffing because
passwords will be sent over the wire in the clear.
+ machine leaves your connection open to password sniffing because
passwords will be sent over the wire in the clear.
</para>
<para>
+ Please note that re-writing the configuration file using SWAT will
+ remove all comments!
More information about SWAT can be found in <link linkend="SWAT">The
Samba Web Administration Tool</link>.
</para>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-Passdb.xml
b/docs-xml/Samba3-HOWTO/TOSHARG-Passdb.xml
index 957abbf..8659437 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-Passdb.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-Passdb.xml
@@ -757,7 +757,7 @@ Samba-3 introduces a number of new password backend
capabilities.
<indexterm><primary>trust accounts</primary></indexterm>
The POSIX and sambaSamAccount components of computer (machine)
accounts are both used by Samba.
Thus, machine accounts are treated inside Samba in the same way
that Windows NT4/200X treats
- them. A user account and a machine account are
indistinquishable from each other, except that
+ them. A user account and a machine account are
indistinguishable from each other, except that
the machine account ends in a $ character, as do trust accounts.
</para>
@@ -1050,7 +1050,7 @@ is being added to the <command>net</command> toolset (see
<link linkend="NetComm
<entry><para>0</para></entry>
</row>
<row>
- <entry><para>Mimimum Password
Length</para></entry>
+ <entry><para>Minimum Password
Length</para></entry>
<entry><para>min password
length</para></entry>
<entry><para>1 - 14
(Chars)</para></entry>
<entry><para>0 - 4294967295
(Chars)</para></entry>
@@ -1615,7 +1615,7 @@ account policy value for password history is now 4
&rootprompt; pdbedit -P "maximum password age" -C 7776000
account policy value for maximum password age was 4294967295
account policy value for maximum password age is now 7776000
-&rootprompt; pdbedit -P "minimum password age" -C 7
+&rootprompt; pdbedit -P "minimum password age" -C 604800
account policy value for minimum password age was 0
account policy value for minimum password age is now 7
&rootprompt; pdbedit -P "bad lockout attempt" -C 8
@@ -1735,7 +1735,7 @@ to be removed.
<listitem><para>
<indexterm><primary>lookups</primary></indexterm>
The first problem is that all lookups must be performed
sequentially. Given that
- there are approximately two lookups per domain logon (one
during intial logon validation
+ there are approximately two lookups per domain logon (one
during initial logon validation
and one for a session connection setup, such as when mapping a
network drive or printer), this
is a performance bottleneck for large sites. What is needed is
an indexed approach
such as that used in databases.
@@ -2626,7 +2626,7 @@ sambaNTPassword: 878D8014606CDA29677A44EFA1353FC7
</sect3>
<sect3>
- <title>Using OpenLDAP Overlay for Password
Syncronization</title>
+ <title>Using OpenLDAP Overlay for Password
Synchronization</title>
<para>
Howard Chu has written a special overlay called
<command>smbk5pwd</command>. This tool modifies the
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-foreword-cargill.xml
b/docs-xml/Samba3-HOWTO/TOSHARG-foreword-cargill.xml
index 6331d2f..b5da92d 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-foreword-cargill.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-foreword-cargill.xml
@@ -38,7 +38,7 @@ know</emphasis>, why are you doing a standard?
<para>
A <emphasis>good standard</emphasis> survives because people know how to use
it. People know how to use a
-standard when it is so transparent, so obvious, and so easy that it become
invisible. And a standard becomes
+standard when it is so transparent, so obvious, and so easy that it becomes
invisible. And a standard becomes
invisible only when the documentation describing how to deploy it is clear,
unambiguous, and correct. These
three elements must be present for a standard to be useful, allowing
communication and interaction between two
separate and distinct entities to occur without obvious effort. As you read
this book, look for the evidence
diff --git a/docs-xml/Samba3-HOWTO/index.xml b/docs-xml/Samba3-HOWTO/index.xml
index 87b0795..384994f 100644
--- a/docs-xml/Samba3-HOWTO/index.xml
+++ b/docs-xml/Samba3-HOWTO/index.xml
@@ -3,7 +3,7 @@
<book id="Samba-HOWTO-Collection"
xmlns:xi="http://www.w3.org/2003/XInclude";>
-<title>The Official Samba 3.2.x HOWTO and Reference Guide</title>
+<title>The Official Samba 3.0.x HOWTO and Reference Guide</title>
<bookinfo>
<authorgroup>
diff --git a/docs-xml/manpages-3/libsmbclient.7.xml
b/docs-xml/manpages-3/libsmbclient.7.xml
index fce0b8e..74f8030 100644
--- a/docs-xml/manpages-3/libsmbclient.7.xml
+++ b/docs-xml/manpages-3/libsmbclient.7.xml
@@ -18,10 +18,11 @@
<refsynopsisdiv>
<cmdsynopsis>
- <command>Browser URL:</command>
<para>
- smb://[[[domain:]user[:passw...@]]server[/share[/path[/file]]]]
[?options]
- </para>
+ Browser URL:
+ <command
moreinfo="none">smb://[[[domain:]user[:passw...@]]server[/share[/path[/file]]]]
[?options]
+ </command>
+ </para>
</cmdsynopsis>
</refsynopsisdiv>
diff --git a/docs-xml/manpages-3/mount.cifs.8.xml
b/docs-xml/manpages-3/mount.cifs.8.xml
index 86242a2..86e4670 100644
--- a/docs-xml/manpages-3/mount.cifs.8.xml
+++ b/docs-xml/manpages-3/mount.cifs.8.xml
@@ -43,10 +43,13 @@ by the popular Open Source server Samba.
</para>
<para>
- The mount.cifs utility attaches the UNC name (exported network
resource) to
- the local directory <emphasis>mount-point</emphasis>. It is possible to
set the mode for mount.cifs to
-setuid root to allow non-root users to mount shares to directories for which
they
-have write permission.
+ The mount.cifs utility attaches the UNC name (exported network resource)
+ specified as <emphasis>service</emphasis> (using //server/share syntax,
+ where "server" is the server name or IP address and "share" is the name
+ of the share) to the local directory <emphasis>mount-point</emphasis>.
+ It is possible to set the mode for mount.cifs to setuid root to allow
+ non-root users to mount shares to directories for which they
+ have write permission.
</para>
<para>
@@ -137,7 +140,7 @@ credentials file properly.
same domain (e.g. running winbind or nss_ldap) and
the server supports the Unix Extensions then the uid
and gid can be retrieved from the server (and uid
- and gid would not have to be specifed on the mount.
+ and gid would not have to be specified on the mount.
For servers which do not support the CIFS Unix
extensions, the default uid (and gid) returned on lookup
of existing files will be the uid (gid) of the person
@@ -369,9 +372,9 @@ port 445 is tried and if no response then port 139 is tried.
<term>noacl</term>
<listitem><para>Do not allow POSIX ACL operations even if
server would support them.</para><para>
The CIFS client can get and set POSIX ACLs (getfacl, setfacl)
to Samba servers
- version 3.10 and later. Setting POSIX ACLs requires enabling
both XATTR and
+ version 3.0.10 and later. Setting POSIX ACLs requires enabling
both XATTR and
then POSIX support in the CIFS configuration options when
building the cifs
- module. POSIX ACL support can be disabled on a per mount basic
by specifying
+ module. POSIX ACL support can be disabled on a per mount basis
by specifying
"noacl" on mount.</para>
</listitem>
</varlistentry>
diff --git a/docs-xml/smbdotconf/printing/printing.xml
b/docs-xml/smbdotconf/printing/printing.xml
index 3be0f42..c365594 100644
--- a/docs-xml/smbdotconf/printing/printing.xml
+++ b/docs-xml/smbdotconf/printing/printing.xml
@@ -33,4 +33,6 @@
<para>See also the discussion in the <link linkend="PRINTERSSECT">
[printers]</link> section.</para>
</description>
+<value type="default">Depends on the operating system, see
+<command moreinfo="none">testparm -v.</command></value>
</samba:parameter>
diff --git a/examples/smb.conf.default b/examples/smb.conf.default
index 971ca19..b4e3d63 100644
--- a/examples/smb.conf.default
+++ b/examples/smb.conf.default
@@ -204,7 +204,7 @@
; comment = Public Stuff
; path = /home/samba
; public = yes
-; writable = yes
+; writable = no
; printable = no
; write list = @staff
diff --git a/release-scripts/build-docs b/release-scripts/build-docs
index b80a7fb..5da641a 100755
--- a/release-scripts/build-docs
+++ b/release-scripts/build-docs
@@ -1,8 +1,14 @@
#!/bin/sh
+_exit() {
+ echo $@
+ popd
+ exit 1
+}
+
DOCSRCDIR=`dirname $0`/../docs-xml
-cd $DOCSRCDIR || exit 1
+pushd $DOCSRCDIR || exit 1
git clean -d -x -f
autoconf && \
@@ -11,21 +17,23 @@ autoconf && \
make release
if [ $? != 0 ]; then
- echo "Docs build failed!"
- exit 1
+ _exit "Docs build failed!"
fi
-mkdir ../docs
+mkdir -p ../docs
rsync -Ca --delete --exclude=.git output/ ../docs/
rsync -Ca --exclude=.svn registry ../docs/
rsync -Ca --exclude=.svn archives/ ../docs/
-cd ../docs || exit 1
+cd ../docs || _exit "Error changing dir to ${DOCSDIR}/../docs/"
+
/bin/rm -rf test.pdf Samba4*pdf htmldocs/Samba4* htmldocs/test
mv manpages-3 manpages
mv htmldocs/manpages-3 htmldocs/manpages
-cd ../docs-xml || exit 1
-make clean
+cd ../docs-xml || _exit "Error changing dir to ${DOCSDIR}/../docs-xml/"
+make distclean
+echo "Success"
+popd
exit
diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball
index da39d89..d468dd3 100755
--- a/release-scripts/create-tarball
+++ b/release-scripts/create-tarball
@@ -183,6 +183,10 @@ function main
if [ -n "$vendor_version" ]; then
version="$version-$vendor_version"
fi
+ vendor_patch=`grep "define SAMBA_VERSION_VENDOR_PATCH" $VER_H | awk
'{print $3}'`
+ if [ -n "$vendor_patch" ]; then
+ version="$version-$vendor_patch"
+ fi
version=`echo $version | sed 's/\"//g'`
echo "Creating release tarball for Samba $version"
diff --git a/source/Makefile.in b/source/Makefile.in
index 80b2a11..cac2635 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -144,7 +144,7 @@ PATH_FLAGS = $(PATH_FLAGS6) $(PASSWD_FLAGS)
# Note that all executable programs now provide for an optional executable
suffix.
-SBIN_PROGS = bin/s...@exeext@ bin/n...@exeext@ bin/s...@exeext@
@EXTRA_SBIN_PROGS@ @CIFSUPCALL_PROGS@
+SBIN_PROGS = bin/s...@exeext@ bin/n...@exeext@ bin/s...@exeext@
@EXTRA_SBIN_PROGS@
ROOT_SBIN_PROGS = @CIFSMOUNT_PROGS@
diff --git a/source/VERSION b/source/VERSION
index 4351b58..ae54185 100644
--- a/source/VERSION
+++ b/source/VERSION
@@ -25,7 +25,7 @@
########################################################
SAMBA_VERSION_MAJOR=3
SAMBA_VERSION_MINOR=0
-SAMBA_VERSION_RELEASE=35
+SAMBA_VERSION_RELEASE=36
########################################################
# Bug fix releases use a letter for the patch revision #
diff --git a/source/client/mount.cifs.c b/source/client/mount.cifs.c
index 1ac1410..d05115b 100644
--- a/source/client/mount.cifs.c
+++ b/source/client/mount.cifs.c
@@ -1,10 +1,11 @@
/*
Mount helper utility for Linux CIFS VFS (virtual filesystem) client
Copyright (C) 2003,2008 Steve French (sfre...@us.ibm.com)
+ Copyright (C) 2008 Jeremy Allison (j...@samba.org)
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -13,8 +14,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
@@ -57,6 +57,10 @@
#endif /* _SAMBA_BUILD_ */
#endif /* MOUNT_CIFS_VENDOR_SUFFIX */
+#ifdef _SAMBA_BUILD_
+#include "include/config.h"
+#endif
+
--
Samba Shared Repository
