Miguel Suarez [Tue, 3 Feb 2009 22:31:51 +0000 (14:31 -0800)]
Fix bug #6085 - In vfs_default.c change utime( ) call.
(cherry picked from commit
7a1408f89f1addff993d1e2dfb7462d12d0a2f48)
Ted Percival [Tue, 3 Feb 2009 22:10:20 +0000 (14:10 -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)
Lars Müller [Mon, 2 Feb 2009 20:38:38 +0000 (21:38 +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)
Lars Müller [Mon, 2 Feb 2009 20:12:52 +0000 (21:12 +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)
Günther Deschner [Fri, 5 Sep 2008 12:01:45 +0000 (14:01 +0200)]
build: don't install the cifs.upcall binary twice.
Guenther
(cherry picked from commit
5202fa31b227d8dd9a3ddfab26f7933bfd349281)
Karolin Seeger [Mon, 2 Feb 2009 10:46:39 +0000 (11:46 +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)
Michael Adam [Tue, 27 Jan 2009 14:52:03 +0000 (15:52 +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)
Michael Adam [Tue, 27 Jan 2009 11:37:13 +0000 (12:37 +0100)]
libreplace: fix bug #6066 - netinet/ip.h present but cannot be compiled
under solaris
Michael
(cherry picked from commit
d09c9b459638242b9df53cc82a8849699d572486)
Michael Adam [Wed, 21 Jan 2009 14:10:10 +0000 (15:10 +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 <obnox@samba.org>
(cherry picked from commit
84433b32a9339662ddad9443b90beafdcd8a2044)
Michael Adam [Wed, 21 Jan 2009 14:09:46 +0000 (15:09 +0100)]
s3:docs: clean build/catalog.xml in "make clean"
Michael
(cherry picked from commit
5e21fc3506f2ba7b1135b1acad2697dfb86b5df0)
Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit
12116d757e2d9e3472dcccecc83ba77e09767d52)
Michael Adam [Wed, 21 Jan 2009 14:09:12 +0000 (15:09 +0100)]
s3:docs: clean generated .png images in "make clean"
Michael
(cherry picked from commit
9b32e839bec8611c30745607a3a6b124d5b34c01)
Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit
c6c1ab779c50c24c362132d4a5f26bee198a8a1a)
Michael Adam [Wed, 21 Jan 2009 10:47:46 +0000 (11:47 +0100)]
s3:docs: fix ommission in fix of (real)distclean targets
Michael
(cherry picked from commit
37412017c5dd2f05a7f4bbe0410a6e00ce4805e5)
Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit
892ab9ce709a478fad31f552a70a4b5992a386ed)
Michael Adam [Wed, 21 Jan 2009 10:45:23 +0000 (11:45 +0100)]
s3:create-tarball: also include the VENDOR_PATCH in the version
Michael
(cherry picked from commit
ce3e34d37ce5592e0268be5d16240387d971585a)
Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit
347cc7f911cdbbe04aa3254444f7060cb0d2038e)
Michael Adam [Wed, 21 Jan 2009 10:41:14 +0000 (11:41 +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 <obnox@samba.org>
(cherry picked from commit
4976a8737700aff1772126375b60566046f29ec4)
Jelmer Vernooij [Tue, 27 May 2008 16:40:14 +0000 (18:40 +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 <obnox@samba.org>
(cherry picked from commit
c52786ee1c37139b9d2f7041fcc858cdd0c6e8f3)
Jelmer Vernooij [Wed, 21 May 2008 15:55:20 +0000 (17:55 +0200)]
Use double colon targets.
(This used to be commit
825cf91fa8b30a67d04cbda8885ff62a4c26458f)
(cherry picked from commit
323be4a6907e4915bb76aa103bf5b868f0b459b1)
Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit
9894ba47fa0d75bf0b9b2993eb6115a33e39ce9c)
Jelmer Vernooij [Fri, 16 May 2008 13:46:36 +0000 (15:46 +0200)]
Add test target in Makefile.
(This used to be commit
ac0d768676b1b8105a9141169b1afa248df6ce66)
(cherry picked from commit
0f3ba4b766ed83d2a38e6cae8db8690374d88989)
Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit
f430afc9c78178184601b08ea3e2efd5b1db761c)
Jelmer Vernooij [Fri, 16 May 2008 13:31:54 +0000 (15:31 +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 <obnox@samba.org>
(cherry picked from commit
4591c073be8feb767764aaa4030d6f23ea4a07db)
Andreas Schneider [Mon, 26 Jan 2009 13:38:34 +0000 (14:38 +0100)]
Document default of the printing config variable.
Signed-off-by: Andreas Schneider <anschneider@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)
Karolin Seeger [Fri, 23 Jan 2009 12:02:46 +0000 (13:02 +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)
Jeremy Allison [Fri, 23 Jan 2009 00:29:46 +0000 (16:29 -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)
Jeremy Allison [Fri, 23 Jan 2009 00:04:36 +0000 (16:04 -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)
Jeremy Allison [Thu, 22 Jan 2009 22:31:27 +0000 (14:31 -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)
Jeremy Allison [Thu, 22 Jan 2009 18:58:38 +0000 (10:58 -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)
Karolin Seeger [Wed, 21 Jan 2009 10:37:30 +0000 (11:37 +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)
Karolin Seeger [Mon, 22 Jun 2009 20:35:07 +0000 (22:35 +0200)]
VERSION: Raise version number to 3.0.35.
Karolin
Karolin Seeger [Mon, 22 Jun 2009 20:34:42 +0000 (22:34 +0200)]
WHATSNEW: Update changes since 3.0.34.
Karolin
Jeremy Allison [Mon, 22 Jun 2009 20:29:49 +0000 (22:29 +0200)]
Fix bug #6488.
Karolin Seeger [Tue, 9 Dec 2008 21:08:13 +0000 (22:08 +0100)]
build-docs: Change to the right directory before calling 'make clean'.
This fixes build-docs if it's called from the create-tarball script.
Karolin
(cherry picked from commit
dd3ef73c8c184eaec7ee515ef2130f30f9e481b3)
(cherry picked from commit
1e7c488097d67457632778a09e7f82db5d0e93e3)
Karolin Seeger [Thu, 18 Sep 2008 13:52:06 +0000 (15:52 +0200)]
Karolin Seeger [Mon, 19 Jan 2009 09:22:46 +0000 (10:22 +0100)]
S3-ByExample: Use 'winbindd -D' instead of 'winbindd -B'.
The option '-B' does not exist at all.
Thanks to Jason Ellison for reporting!
Karolin
(cherry picked from commit
4b26c7bbf4fe93f5ffb92d3f04012be290be25be)
(cherry picked from commit
05c7d97e6cf25c05ba6a661c0a31c88946ffd5cd)
(cherry picked from commit
f89c3db4ae0bcf1680c2532833ee115005b8ed70)
(cherry picked from commit
604fb1e00c18d81b5be8f096274e8a121a413745)
Karolin Seeger [Mon, 19 Jan 2009 07:55:30 +0000 (08:55 +0100)]
S3-HowTo: Change 'winbindd -B' to 'winbindd -D'.
There is no option '-B' at all.
Thanks to Jason Ellison for reporting!
Karolin
(cherry picked from commit
7c1e08518bfbe054db270e72476c642d5db93c0a)
(cherry picked from commit
3b5d2fd4cc5f7cbe22be1dfc593ca4ba29197b66)
(cherry picked from commit
0900b10f64fbb9f2e55591d1b11be9bb29526744)
(cherry picked from commit
f41988a343b1ac38e184f0e3aa34c6050953a6b4)
Karolin Seeger [Thu, 15 Jan 2009 07:34:53 +0000 (08:34 +0100)]
WHATSNEW: Update WHATSNEW.
Karolin
(cherry picked from commit
f121ad38a1306b3c69eb4485b18ed187d1fd9270)
Jeremy Allison [Wed, 14 Jan 2009 21:17:58 +0000 (13:17 -0800)]
Fix bug #6035 - Possible race between fcntl F_SETLKW and alarm delivery.
Jeremy.
(cherry picked from commit
0b880a684356d5cc2c266c760994838910134eef)
Karolin Seeger [Wed, 14 Jan 2009 13:02:08 +0000 (14:02 +0100)]
WHATSNEW: Update changes since 3.0.33.
Karolin
(cherry picked from commit
01debccb65fe63b070a2e219f7e4f2903f19fcfd)
Karolin Seeger [Wed, 14 Jan 2009 12:59:19 +0000 (13:59 +0100)]
WHATSNEW: Update WHATSNEW.
Karolin
(cherry picked from commit
5c3ec78c6dda9f354bee030967364411aafc0817)
Karolin Seeger [Wed, 14 Jan 2009 12:53:12 +0000 (13:53 +0100)]
VERSION: Raise version number up to 3.0.34.
Karolin
(cherry picked from commit
d5e8b958c33491635a07be7b6ad84c0218d83aad)
Jeremy Allison [Tue, 13 Jan 2009 19:24:24 +0000 (11:24 -0800)]
Fix bug #6019 File corruption in Clustered SMB/NFS environment managed via CTDB
Jeremy.
(cherry picked from commit
974262ba3e8226ec9805d38e602ec8d083e44f72)
Karolin Seeger [Mon, 17 Nov 2008 14:23:34 +0000 (15:23 +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)
(cherry picked from commit
4d988d0c9f22dda706ee1802985830ce4999f4d5)
(cherry picked from commit
b0f66f65e4d7cf0d70708783e5486fe3e1e5e8e8)
Karolin Seeger [Wed, 19 Nov 2008 12:16:38 +0000 (13:16 +0100)]
build-docs: Use 'git clean' instead of 'git-clean'.
Karolin
(cherry picked from commit
12e72140b944f844e7f44f21a087ab4a4ecc51a7)
(cherry picked from commit
ab02316ced8b0dc0d577960d1bab02d239313ef5)
(cherry picked from commit
d70bd3eebfa8a8705db2bdf9a3fd0e037701a756)
Stefan Metzmacher [Mon, 12 Jan 2009 11:32:46 +0000 (12:32 +0100)]
s3:libsmb: handle the smb signing states the same in the krb5 and ntlmssp cases
SMB signing works the same regardless of the used auth mech.
We need to start with the temp signing ("BSRSPYL ")
and the session setup response with NT_STATUS_OK
is the first signed packet.
Now we set the krb5 session key if we got the NT_STATUS_OK
from the server and then recheck the packet.
All this is needed to make the fallback from krb5 to
ntlmssp possible. This commit also resets the cli->vuid
value to 0, if the krb5 auth didn't succeed. Otherwise
the server handles NTLMSSP packets as krb5 packets.
The restructuring of the SMB signing code is needed to
make sure the krb5 code only starts the signing engine
on success. Otherwise the NTLMSSP fallback could not initialize
the signing engine (again).
metze
(cherry picked from commit
7d9fd64f38aa5821b38c1223cf87979fc87bfb71)
(cherry picked from commit
8e29070ccd0b5103af2e6da75644169f46700313)
(cherry picked from commit
38b297f99ec166e5c40ba33774222b37b45b4fec)
(a little bit modified to compile in v3-0)
(cherry picked from commit
db109da6b10a091593435e3f8b0d9adb57d3c972)
Karolin Seeger [Mon, 12 Jan 2009 11:30:13 +0000 (12:30 +0100)]
WHATSNEW: Add footer.
Karolin
(cherry picked from commit
c53a691187a855b9f5ac06f83aebcc51b8d20bf7)
Karolin Seeger [Mon, 12 Jan 2009 11:25:58 +0000 (12:25 +0100)]
WHATSNEW: Update changes since 3.0.33.
Karolin
(cherry picked from commit
8fb328a16feb0b3e9b1bdf8f9a451b1a271d3e4d)
Karolin Seeger [Mon, 12 Jan 2009 09:15:36 +0000 (10:15 +0100)]
VERSION: Remove git snapshot flag.
Karolin
Bo Yang [Mon, 12 Jan 2009 06:15:00 +0000 (14:15 +0800)]
Fix null pointer refrence in event context in backport from v3-3-test
Signed-off-by: Bo Yang <boyang@novell.com>
(cherry picked from commit
514dfc632ed35a80a175a4afbe9607aa4d913da3)
Jeremy Allison [Sun, 11 Jan 2009 04:04:27 +0000 (20:04 -0800)]
Fix logic bug introduce in backport of ccache_regain_all_now, sync with
3.3 implementation.
Jeremy.
(cherry picked from commit
ab29d6c6d349352db017d3046aeaee59e33745f4)
Bo Yang [Sat, 10 Jan 2009 22:32:43 +0000 (14:32 -0800)]
Backport of the clean event context after fork and
krb5 refresh chain fixes.
(cherry picked from commit
194425f8074e2cfd5893499099614666f8d8ecd9)
Bo Yang [Sat, 10 Jan 2009 22:13:32 +0000 (14:13 -0800)]
Don't set child->requests to NULL in parent after fork
(cherry picked from commit
a4438df44621ae37c13e5c5064cc3dc5e1371457)
Karolin Seeger [Fri, 9 Jan 2009 10:22:00 +0000 (11:22 +0100)]
docs: Improve man mount.cifs.
Add hint about specifying the workgroup in the credentials file.
Whitespace cleanup.
This fixes bug #4541.
Patch based on proposed patch from Christian Perrier <bubulle@debian.org>.
Thanks for reporting and providing a patch!
Karolin
(cherry picked from commit
1f7e09ea542df3a2f5f553c0cb11a39c74712950)
(cherry picked from commit
b99d98ff2ef5491979301656e7f516d3c8829f6e)
(cherry picked from commit
1900233ede3083410eb3dc691d2d486c5340ccc4)
(cherry picked from commit
47f4662b6d727f2901d630d74792a6a971b54662)
Jeremy Allison [Thu, 8 Jan 2009 18:56:36 +0000 (10:56 -0800)]
Fix race condition in alarm lock processing noticed by Richard Sharpe <realrichardsharpe@gmail.com>.
"It seems to me that if the lock is already held by another process when we
enter this code, there is a race between the timeout and the granting. If
the lock is subsequently granted, the process releasing the lock will signal
the wait variable (or whatever) and our process will be scheduled. However,
if the timeout occurs before we are scheduled, the timeout will be delivered
first.
We will have the lock but will forget we have the lock, and never release
it."
Jeremy.
(cherry picked from commit
8904b83ce6c69db31dc2ce4c05e8e8ee3db5ec3b)
Volker Lendecke [Tue, 6 Jan 2009 14:13:43 +0000 (15:13 +0100)]
s3/swat: Fix creation of the first share using SWAT.
This fixes bug #5965.
(cherry picked from commit
f76614169f1e0a932cf2895702cfa9e8a5735875)
(cherry picked from commit
148437fcd0896591ebbf6c2808723575d025123f)
(cherry picked from commit
3ee41667d7bb8358c80af24f78dbdd071fa9c765)
Karolin Seeger [Tue, 6 Jan 2009 11:26:23 +0000 (12:26 +0100)]
docs: Improve description of the share commands in man smb.conf.
-Correct the parameter names.
-Fix typos.
-Fix related parameters.
This fixes bug #6008.
Thanks to TAKAHASHI Motonobu <monyo@samba.gr.jp> for reporting!
Karolin
(cherry picked from commit
8b7f66c548ed170d2dab0c91ccff4aca00f4b52d)
(cherry picked from commit
6f38786aa878bd1a7fc10069773c19b28437fbbb)
(cherry picked from commit
f420b5c2af7d46e88269d9ec89c5dcd37f1f8f46)
(cherry picked from commit
98e2d6614f00f207de42a79d329b63e7966ab8ea)
Karolin Seeger [Tue, 6 Jan 2009 09:26:37 +0000 (10:26 +0100)]
docs: Fix example in man vfs_recycle.
This fixes bug #6001.
Thanks to TAKAHASHI Motonobu <monyo@samba.gr.jp> for reporting!
Karolin
(cherry picked from commit
9f44a17c3bf36067d04cec036c3e529798932cd7)
(cherry picked from commit
5e073807f7c4679dd299a2b8f3e2643dc1c82405)
(cherry picked from commit
c0877d14cb04956b29ca329897a7b4bface7f363)
(cherry picked from commit
232503ba417f51d93e22a2411b2d446596284e59)
Karolin Seeger [Mon, 5 Jan 2009 15:33:00 +0000 (16:33 +0100)]
examples: Avoid bashism in perfcount.init.
This fixes bug #6000.
Thanks to the Debian Samba package maintainers for providing the patch!
Remove trailing whitespaces.
Karolin
(cherry picked from commit
2e09746a4db4186c9d648370b9004971bc18e5c9)
(cherry picked from commit
9b17f7907bca32282d6e56fa28ca62ef84bf7afc)
(cherry picked from commit
de41f0e9a08b796873bdd319fe784b6c90e28b23)
(cherry picked from commit
e5e8a4a6fa866a23377d0a92eff433b59abfcebe)
Karolin Seeger [Mon, 5 Jan 2009 15:38:25 +0000 (16:38 +0100)]
Revert "examples: Avoid bashism in perfcount.init."
This reverts commit
744c7007b4b798699613e06933f92fdf5261b222.
(cherry picked from commit
26080fd575df450166e13836ea227a6d191e86c4)
Karolin Seeger [Mon, 5 Jan 2009 13:54:28 +0000 (14:54 +0100)]
examples: Avoid bashism in perfcount.init.
This fixes bug #6000.
Thanks to the Debian Samba package maintainers for providing the patch!
Remove trailing whitespaces.
Karolin
(cherry picked from commit
73875cd344608b591fa884ab99b5f3a10550c149)
(cherry picked from commit
e273c07e94ee607bbf05b6fa66cf3cea13fe4502)
(cherry picked from commit
a1bf1f1819ab184682327583d05b0258db8856ef)
(cherry picked from commit
b4ffffc5c03b69ac2f8e0ed74fd7788549f7e822)
(cherry picked from commit
744c7007b4b798699613e06933f92fdf5261b222)
Karolin Seeger [Mon, 5 Jan 2009 13:39:59 +0000 (14:39 +0100)]
docs: Document the -g option of smbclient.
This fixes bug #6013.
Thanks to the Debian Samba packages maintainers for reporting!
Karolin
(cherry picked from commit
6752d78e946b2c4278e2deba325c76fb7ffbc06a)
(cherry picked from commit
e6abdbde9b67801d46c9d331045d155717e8b241)
(cherry picked from commit
8a79b8796f98dd80b6e1f04d7302fb8342f0052d)
(cherry picked from commit
1f979334266706656874fdbe6cce14f17105360b)
(cherry picked from commit
74f5828112581fa230301f43f7685ec208a8e4f6)
Stefan Metzmacher [Fri, 2 Jan 2009 08:46:17 +0000 (09:46 +0100)]
Happy New Year!
metze
(cherry picked from commit
041435d841b457f493c940e0281cd496b52fb7dc)
Karolin Seeger [Wed, 17 Dec 2008 15:26:43 +0000 (16:26 +0100)]
s3/smb.h: Remove unused LDAP_SSL_ON.
LDAP_SSL_ON is not defined at all.
Ldaps can be used by specifying an ldaps URL using the "passdb backend"
parameter.
Karolin
(cherry picked from commit
0c6cf1f8793edfde924289aafbd174ce4a4fae0c)
(cherry picked from commit
7f36de6906811d4f0428b75c79c72b17b8ccfcef)
(cherry picked from commit
a3113657b4427eddcfbb10d71e9e8ade06bbd16f)
Karolin Seeger [Wed, 17 Dec 2008 14:53:51 +0000 (15:53 +0100)]
s3/loadparm.c: Change default value for "ldap ssl".
LDAP_SSL_ON is not defined at all. That's why the actual default value
was "" for a long time. Set a more sensible default value without chnging the
default behaviour.
-----8<------------------snip--------------8<--------------
user@host:/data/git/samba/v3-0-test/source> git grep LDAP_SSL_ON | cat
include/smb.h:enum ldap_ssl_types {LDAP_SSL_ON, LDAP_SSL_OFF,
LDAP_SSL_START_TLS};
param/loadparm.c: Globals.ldap_ssl = LDAP_SSL_ON;
----->8------------------snap-------------->8--------------
It's the same in 3.2 and 3.3 series.
Karolin
(cherry picked from commit
e6d883e003d4560c55259ae1cfdf7319602f76e3)
(cherry picked from commit
5c686419096362176d80f3d05339b8836d0178a4)
(cherry picked from commit
7a39f3eaf571fd9da6f8e103eeb50c5bcebd18c1)
Karolin Seeger [Wed, 17 Dec 2008 15:18:38 +0000 (16:18 +0100)]
docs: Update section "ldap ssl" in man smb.conf.
Remove non-existent value "on".
Change default value to "no".
Add hint about ldaps.
Karolin
(cherry picked from commit
580461629bb88ce3b61770e7abfe2c942a121877)
(cherry picked from commit
d74356627579fe7b9961844a77c4e6daa978d62b)
(cherry picked from commit
882ac5e5a79646754dfd1669ea6720ab52c9b6ee)
(cherry picked from commit
e147c4679f8095738fea6ab2c9fb37fbecc9bb85)
Karolin Seeger [Wed, 17 Dec 2008 14:42:12 +0000 (15:42 +0100)]
docs: Fix some formatting issues in the "ldap ssl" section of man smb.conf.
Karolin
(cherry picked from commit
6ac36698e975649d26e3f2975c2101129c3ffe97)
(cherry picked from commit
655a1c7b05d56326d6cfffbc8e46e1d64565717a)
(cherry picked from commit
2534619eedc3e9528d589cfee793a55b3cc62bed)
(cherry picked from commit
78ec02e8221aea7633ed63f5fc5084a12c9796d4)
Karolin Seeger [Wed, 17 Dec 2008 08:17:26 +0000 (09:17 +0100)]
docs: Fix TOC of generated HTML docs.
This fixes bug #5968.
Thanks to Christian Perrier <bubulle@debian.org> for reporting!
Karolin
(cherry picked from commit
675b363b712e0b91b9b7d1189a819a36853db539)
(cherry picked from commit
3566615292f9cb2d00b03156e515274751e05969)
(cherry picked from commit
0d6b3df8d9c8b5e777ac6717168a11455b2ad2ce)
(cherry picked from commit
875dfb887dba90807ed5b371334574997be419a8)
Karolin Seeger [Tue, 16 Dec 2008 14:10:29 +0000 (15:10 +0100)]
docs: "acl compatibility" is a global parameter.
This fixes bug #5866.
Thanks to TAKAHASHI Motonobu <monyo@samba.gr.jp> for reporting!
Karolin
(cherry picked from commit
9e64ed018e5aa84d802b01953b481fbb07eb00aa)
(cherry picked from commit
386b0fc4bdc0822ffbc51cfee536bea23df0a755)
(cherry picked from commit
877951eea6e67273748aa9f56a56e41cf2dca00a)
(cherry picked from commit
0a93af41475783ab80644729efb48a80915f7bfc)
Karolin Seeger [Tue, 16 Dec 2008 08:04:32 +0000 (09:04 +0100)]
docs: Fix typo in the idmap_ad manpage.
Karolin
(cherry picked from commit
b876e1336bed52e0823e0e88381d223bd6aa95e4)
(cherry picked from commit
611ac35a694930693d2f773d15e59be138261a8e)
(cherry picked from commit
d54a1e49d5fe567bcda7c4c02f6ace2d03e189e9)
(cherry picked from commit
2550b433e8764df83197ffb9f3a7088bbceeb215)
Karolin Seeger [Fri, 12 Dec 2008 13:30:01 +0000 (14:30 +0100)]
docs: Add hint that "socket address" usually don't need to be set.
This fixes bug #5950.
Thanks to the Debian Samba package maintainers for reporting!
Karolin
(cherry picked from commit
19beef0dd9354296ae79d32077c58fbacf570c85)
(cherry picked from commit
0d035d36bd3707ccb9f77f0b2730869dc78719d4)
(cherry picked from commit
6be19f94802d545cc43286aa242b0ca2e5b79721)
(cherry picked from commit
879a4fbe99739b67d877caac2d7a2f763c69d41f)
(cherry picked from commit
51a9b237d401151eed43ab917d2dd10d8693a764)
Karolin Seeger [Thu, 11 Dec 2008 17:08:29 +0000 (18:08 +0100)]
Samba3-HOWTO: Fix usage of 'net idmap restore'.
This fixes bug #5883.
Karolin
(cherry picked from commit
b4a4e635246b88277b235fa343eda48bd4bb4ce3)
(cherry picked from commit
5744177740120524740db884564142df19358ae7)
(cherry picked from commit
7584fe4e8bcbaf73f509d6981a70ff9dde92db1c)
(cherry picked from commit
fda3f00246c3ecb664d2bf387ecd0e28dec16e34)
(cherry picked from commit
90c5d04c5161bd2acb1c16d737b68893f11f3d18)
Jeremy Allison [Thu, 4 Dec 2008 23:35:07 +0000 (15:35 -0800)]
Fix bug #5937 - filenames with "*" char hide other files
Jeremy.
(cherry picked from commit
7917038db0277d16e5284ee261a4913e278e5ac7)
Jeremy Allison [Thu, 4 Dec 2008 19:07:53 +0000 (11:07 -0800)]
Fix bug #1254 - write list not working under share-level security
(mtab.c, fix build).
Jeremy.
(cherry picked from commit
680e4c398c79867f8a7ad40e9c2cd9c401922edd)
Karolin Seeger [Tue, 2 Dec 2008 19:50:02 +0000 (20:50 +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)
(cherry picked from commit
09ccdf6aee15169b0fe9c532ee9143bd0cff9d78)
Andreas Schneider [Wed, 29 Oct 2008 13:12:04 +0000 (14:12 +0100)]
Fix circular dependency error with autoconf 2.6.3.
Signed-off-by: Andreas Schneider <anschneider@suse.de>
(cherry picked from commit
26e82e3e006a80c9d4d1cb437eb39b02efa7c3ad)
Jeremy Allison [Tue, 25 Nov 2008 23:57:18 +0000 (15:57 -0800)]
Fix bug #5914 - Build failure: redefinition of struct name_list
Jeremy.
(cherry picked from commit
d326dc7dc08acbb7bf511ca9579cefe591b0ba94)
Jeremy Allison [Mon, 24 Nov 2008 23:40:50 +0000 (15:40 -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
649572c454328b81714b86d3f99f730bf61625e0)
Stefan Metzmacher [Mon, 24 Nov 2008 14:26:21 +0000 (15:26 +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 ex
and "disable netbios = yes".
metze
Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit
114b94f86e15d482f3b39912f28eb72b66b36bc8)
Michael Adam [Fri, 21 Nov 2008 23:43:43 +0000 (00:43 +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
a2329ec0eea66108f44dae3853e578dbbf835f96)
Michael Adam [Fri, 21 Nov 2008 23:42:54 +0000 (00:42 +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
06f19e52489b3253ea4292795e4c73fa94cfd392)
Yasuma Takeda [Thu, 20 Nov 2008 19:41:47 +0000 (11:41 -0800)]
Fix bug #5909 - MS-DFS does not work on Vista, if link name includes multibyte character.
(cherry picked from commit
92f3ba8e20bd4a5a2afdd13feb5519d723784274)
Dina Fine [Tue, 18 Nov 2008 20:43:26 +0000 (12:43 -0800)]
Fix bug #5908 - Samba 3.0.32 - internal change notify on share directory fails"
(cherry picked from commit
cc97e2a0d51f52a79982ac265f073d3829c1357a)
Carsten Dumke [Thu, 13 Nov 2008 18:05:00 +0000 (12:05 -0600)]
net: Fix documentation of net rap printq info (bug #5892)
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@samba.org>
(cherry picked from commit
67692e9b8f5ae09702c73c081f3a6937bd6de518)
Jeremy Allison [Wed, 12 Nov 2008 22:09:22 +0000 (14:09 -0800)]
Fix memory leak in error path, spotted by Martin Zielinski <mz@seh.de>.
Jeremy.
(cherry picked from commit
ba12ab479b3764e0d251d74401dc5fa31a48f83d)
Kai Blin [Fri, 7 Nov 2008 08:43:46 +0000 (09:43 +0100)]
ntlm_auth: Put huge NTLMv2 blobs into extra_data on CRAP auth
This fixes bug #5865
(cherry picked from commit
1941f42b04dd20763449ba57e4543aca41ca2155)
Kai Blin [Fri, 7 Nov 2008 08:40:35 +0000 (09:40 +0100)]
winbindd: Reformat the WBFLAGS defines to prepare for adding a new flag.
(cherry picked from commit
1f3eba80c8df79f31757bc2075f5730cd261806c)
Jeff Layton [Thu, 6 Nov 2008 20:20:55 +0000 (15:20 -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@redhat.com>
(cherry picked from commit
66ec780d878979a9fa33ff868f1849e9d2166dcf)
Jeremy Allison [Thu, 6 Nov 2008 03:12:10 +0000 (19:12 -0800)]
Add reference to bug #4308 to remind me to add regression test to smbtorture.
Jeremy.
(cherry picked from commit
0de73eeb1a17b6af217babd626b203eca975541f)
Volker Lendecke [Mon, 3 Nov 2008 16:14:35 +0000 (17:14 +0100)]
Fix bug triggered by the RAW-SAMBA3OPLOCKLOGOFF test
(cherry picked from commit
af33c8b3521564c229091f197341ba33a7d6f162)
Günther Deschner [Mon, 25 Aug 2008 09:36:56 +0000 (11:36 +0200)]
auth: Fix build warning.
Guenther
(cherry picked from commit
4661ef625a6522d6f859b83e3e3702f01d0b952f)
(cherry picked from commit
60649a74cdf2594bc89c301025f86d23caba91c2)
(cherry picked from commit
d0c0fc92cd6c7549e190669aeaa605a0d436cf31)
Stefan Metzmacher [Mon, 27 Oct 2008 18:40:23 +0000 (19:40 +0100)]
utils/net_ads.c: call saf_join_store() after a the join.
metze
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit
feef594d275881466e2c3f59c0ff54609a9cc53b)
Stefan Metzmacher [Mon, 27 Oct 2008 18:39:30 +0000 (19:39 +0100)]
libads/ldap.c: store the dc name in the saf cache as in all other places
metze
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit
543fa85a711337e979c7b631bda5db95d109ef59)
Stefan Metzmacher [Mon, 27 Oct 2008 18:38:15 +0000 (19:38 +0100)]
libads/ldap.c: if the client belongs to no site at all any dc is the closest
metze
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit
f86ef9b53a903485deba94febf90dd4e657cc02b)
Stefan Metzmacher [Mon, 27 Oct 2008 18:36:25 +0000 (19:36 +0100)]
libads/ldap.c: pass the real workgroup name to get_dc_name()
metze
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit
c2d4a84abe1b6cbf68d6e9f1bb1f8974d0b628fc)
Stefan Metzmacher [Mon, 27 Oct 2008 18:31:30 +0000 (19:31 +0100)]
libsmb/namequery.c: add saf_join_store() function
saf_join_store() should be called after a successful
domain join, the affinity to the dc used at join time
has a larger ttl, to avoid problems with delayed replication.
metze
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit
80e74a27c55c01221091e3eec930c2ac4433c22c)
Stefan Metzmacher [Mon, 27 Oct 2008 08:40:25 +0000 (09:40 +0100)]
libsmb/namequery: fallback to returning all dcs, when none is available in the requested site
It could happen that all dcs in a site are unavailable
(some sites have only one dc) and then we need to fallback
to get all dcs.
metze
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit
c127367b1dd622eeceb1f47de0a047c297dda222)
Stefan Metzmacher [Wed, 22 Oct 2008 09:14:10 +0000 (11:14 +0200)]
s3: libads: use get_dc_name() instead of get_sorted_dc_list() in the LDAP case
We use get_dc_name() for LDAP because it generates the selfwritten
krb5.conf with the correct kdc addresses and sets KRB5_CONFIG.
For CLDAP we need to use get_sorted_dc_list() to avoid recursion.
metze
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit
d2f7f81f4d61bae9c4be65cbc1bf962b6c24a31f)
Stefan Metzmacher [Wed, 22 Oct 2008 08:36:21 +0000 (10:36 +0200)]
s3: correctly detect if the current dc is the closest one
ads->config.tried_closest_dc was never set.
metze
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit
dfe5b00db35e1e7c7bb3ba36729fc3f97eb48db3)
Michael Adam [Mon, 27 Oct 2008 13:28:44 +0000 (14:28 +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
559ba0215cada4093efd22f165b608c41913d935)
Andreas Schneider [Fri, 24 Oct 2008 10:01:24 +0000 (12:01 +0200)]
Fix the build of pam_winbind.
(cherry picked from commit
90651d77f1f7fc6d29629d3a0dd566d07c090609)
Andreas Schneider [Mon, 20 Oct 2008 15:39:35 +0000 (17:39 +0200)]
Delete the krb5 ccname variable from the PAM environment if set.
If winbind sets the KRB5CCNAME variable it should unset it when
the cache gets destroyed.
(cherry picked from commit
98f3369e08f4d5bc759e93d36f3d67a3c057f40d)
Jeremy Allison [Fri, 17 Oct 2008 04:01:56 +0000 (21:01 -0700)]
Cope with bad trans2mkdir requests from System i QNTC IBM SMB client.
If total_data == 4 Windows doesn't care what values
are placed in that field, it just ignores them.
The System i QNTC IBM SMB client puts bad values here,
so ignore them.
Jeremy.
(cherry picked from commit
cfdbe8a1f2057ad1a8886ca7445a812219648d19)
Jeff Layton [Thu, 9 Oct 2008 14:51:33 +0000 (10:51 -0400)]
mount.cifs: make return codes match the return codes for /bin/mount (try #3)
The manpage for /bin/mount specifies that the return code should be a
positive integer (actually, it's a bitfield). Clean up the return
codes from mount.cifs to make them match the expected return values
from /bin/mount. This necessary for proper integration with autofs.
This is the third attempt at this patch. The changes here are minor,
just changing some return's from main() into exit() calls for
consistency's sake.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit
4558c09c921793dd358de3ad4b9b4dd091e43662)
Jeff Layton [Thu, 9 Oct 2008 14:47:45 +0000 (10:47 -0400)]
mount.cifs: have uppercase_string return success on NULL pointer
We currently don't attempt to uppercase the device portion of the mount
string if there isn't a prefixpath. Fix that by making uppercase_string
return success without doing anything on a NULL pointer.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit
41849ee120297b845ef288c76b45d039ad04112d)