Jelmer Vernooij
aaa2770666
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
...
(This used to be commit 5a30f6377d37d8a5cadce4fb9a2fc19b78fc1709)
2008-01-05 23:09:38 +01:00
Jelmer Vernooij
3ba8fbef29
selftest: Use platform-specific equivalents of LD_LIBRARY_PATH for Samba4's smbtorture.
...
(This used to be commit 64ff1dad8664f14030c7d78c252d946216798a88)
2008-01-05 23:09:25 +01:00
Steve French
56a8ef0bbb
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
...
(This used to be commit d3b91e494c824a65506ba1bc1cba5bba77000530)
2008-01-05 14:51:23 -06:00
Jeremy Allison
4a413e4bd1
Fix %d / size_t printf arg missmatch.
...
Jeremy.
(This used to be commit 3e3205309b75edf7d29633525adfdceb5f8856eb)
2008-01-05 01:17:33 -08:00
Jeremy Allison
3d7a8a9fa1
Fix missing return - should be void.
...
Jeremy.
(This used to be commit 45ae90b77e53cd0cdf50939528dac4d2ca39b5c5)
2008-01-05 01:16:09 -08:00
Jeremy Allison
af2a75ba61
Add -e to smbget.
...
Jeremy.
(This used to be commit 0475bdcf44d21bbdefb57f15d403c91c44d8d90a)
2008-01-05 00:51:50 -08:00
Jeremy Allison
1be3fcbf2f
Add the options smb_encrypt_level to set the requested
...
encrypt level and smb_encrypt_on to query it.
Jeremy.
(This used to be commit 07d47996f9535731ccdc1792c405c8bee1a082ae)
2008-01-05 00:51:18 -08:00
Jeremy Allison
a41972e801
Fix -e for smbcquotas.
...
Jeremy.
(This used to be commit f97b1247c1053f47aef64be95ab9b3c3d8702c8a)
2008-01-05 00:50:03 -08:00
Jeremy Allison
722d288d21
Use the common -e option not the custom one.
...
Jeremy.
(This used to be commit ef1bbcdfb98da185c07005dd7810039f99f0685f)
2008-01-05 00:46:04 -08:00
Jeremy Allison
160fefc71a
Fix args to cli_force_encryption.
...
Jeremy.
(This used to be commit 7b0826aeec284fb129dc1101a5eae2ca96c7cfb6)
2008-01-05 00:41:48 -08:00
Jeremy Allison
9baa97a46e
Add general '-e' option to enable smb encryption
...
on tools.
Jeremy.
(This used to be commit 757653966fc1384159bd2d57c5670cd8af0cae96)
2008-01-05 00:23:35 -08:00
Jeremy Allison
4881ed00ca
More logical operation on bool.
...
Jeremy.
(This used to be commit 7e8e91aeb3795d26ae8591665981bc42d8b6122f)
2008-01-04 23:26:47 -08:00
Jeremy Allison
99e349b35d
More logical operations on booleans. IBM checker.
...
Jeremy.
(This used to be commit e289a0c8592f9e5c58100ddcde2577b452725b88)
2008-01-04 23:24:15 -08:00
Jeremy Allison
c6a2292724
Using a bool with a logical operation. IBM checker caught.
...
Jeremy.
(This used to be commit 7f9fe7da1e25bcc730f4c4226bf77f6d39b5ace4)
2008-01-04 23:17:38 -08:00
Jeremy Allison
d5bd2e7000
Can't use logical operations on boolean values.
...
Jeremy.
(This used to be commit 34cd9b5b51a4209b4d970eb90bf1db0eb24a60bb)
2008-01-04 22:56:06 -08:00
Jeremy Allison
e86fd65dcd
"Desting" -> "Testing"
...
Jeremy.
(This used to be commit c3f3ec5cd5f9ffe8d08356dfd22b1cb6943829ad)
2008-01-04 19:34:43 -08:00
Jeremy Allison
4a95b17fd8
Try and fix scripting errors.
...
Jeremy
(This used to be commit c84f2234fe0068a69fefa3c3ec219d4a95479b0c)
2008-01-04 19:12:29 -08:00
Jeremy Allison
ceba96c915
Try and fix the buildfarm. There's a scripting error and
...
I'm hoping this is it...
Jeremy.
(This used to be commit 0356f0efc4a18230ce7a9c0a17dc98c4242ad38d)
2008-01-04 19:09:46 -08:00
Jeremy Allison
01afb07321
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
...
(This used to be commit 3a45f62310faf63cd6864d2cb10f941492eda818)
2008-01-04 19:06:37 -08:00
Jeremy Allison
3d40b197b0
Add missing patch to allow smbcacls to do krb5 auth, bug #5175
...
from Tom Maher <tmaher@watson.org>.
Jeremy.
(This used to be commit 54ee718957b768a06e41857b96f0b5e18b3ca6a4)
2008-01-04 17:15:04 -08:00
Jeremy Allison
c513ff3675
Better way of testing enc.
...
Jeremy.
(This used to be commit c5800235018330f0c1bbe307cd733597ac9b6686)
2008-01-04 16:58:23 -08:00
Jeremy Allison
95fa10d596
Added -e tests for S3 smbtorture.
...
Jeremy.
(This used to be commit deeeae3ee96f7207a49e1edaa876410b77c33458)
2008-01-04 16:09:48 -08:00
Jeremy Allison
71a24317fe
Added -e option to smbtorture to test encrypted versions
...
of the tests.
Jeremy.
(This used to be commit e85b346f3d73f50d6dea19ffb6cca1180345e687)
2008-01-04 16:09:24 -08:00
Jeremy Allison
29562987c3
Now conn is part of smb_request, we don't need it as
...
an extra parameter. This cleans up quite a few places
we were passing it around without needing it.
Jeremy.
(This used to be commit 8f36def18e9f980e8db522e1de41e80cfd5f466e)
2008-01-04 15:37:24 -08:00
Jeremy Allison
058ba641f3
Fix idle client reading keepalive.
...
Jeremy.
(This used to be commit 4ce0bf785635371e2923217b1e0b7f30986c25bb)
2008-01-04 14:56:56 -08:00
Jeremy Allison
9394916e49
We dont' modify the smb header for crypto anymore.
...
Jeremy.
(This used to be commit f5b6b6dac66b4ecc113985a7e7db1855b324c465)
2008-01-04 14:43:43 -08:00
Volker Lendecke
a8d2664fec
allocate share_mode_str only when needed
...
(This used to be commit a98693bfa7bfe72ffa164d21b3e9636e268708aa)
2008-01-04 23:32:24 +01:00
Günther Deschner
395c366237
Do not pass emtpy wkssvc_PasswordBuffers to rpc functions.
...
Guenther
(This used to be commit fe75e5ccdfc2609380367e59215637b0de1ef241)
2008-01-04 23:03:55 +01:00
Jeremy Allison
3aea92c97f
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
...
(This used to be commit 4e1bf48e7eab927e70fde3408a42c56e06b9b178)
2008-01-04 13:59:52 -08:00
Jeremy Allison
6503c7338e
Fix interesting bug found with make valgrindtest. When cancelling
...
a lock due to file closure make sure we null out the fsp pointer
so it isn't dangling. This is an old bug (not related to the new
changes).
Jeremy.
(This used to be commit b5ee972b0c04b4d119573d95ac458a3b6be30c5c)
2008-01-04 13:59:26 -08:00
Michael Adam
4aba7475ef
Re-Indent function ldap_open_with_timeout().
...
This reverts commit #cafda34783f0961c9b463803c19cfcb69f836e3f .
I just learned (the hard way) that these indeted functions
are not indented by accident but that the intention of this
is to not include the prototype into proto.h.
Michael
(This used to be commit 2e5d01b2146bb9e057b2779d9fe7691ed46d9f45)
2008-01-04 22:56:10 +01:00
Jeremy Allison
fadf9cc1ca
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
...
(This used to be commit 3a62a177ba758b325ab98e9d77d302bc382e0df8)
2008-01-04 13:24:41 -08:00
Jeremy Allison
68b2965108
Fix the build.
...
Jeremy.
(This used to be commit 25a0084af5978cc11cf4e83a641bc57e0e64eb89)
2008-01-04 13:24:24 -08:00
Michael Adam
b54310cbaa
Add a debug message (when the LDAP server has really been connected).
...
Michael
(This used to be commit 7d9d2de39072b3291b95ac3965df0d19f83792b9)
2008-01-04 22:09:36 +01:00
Michael Adam
2cb68e3898
Untangle assignment and result check.
...
Michael
(This used to be commit 465a3b356cffb855e26569d3752f15cac07208c0)
2008-01-04 22:09:36 +01:00
Michael Adam
34e579fce5
Enhance DEBUG-verbosity of ldap_open_with_timeout().
...
Michael
(This used to be commit 9e70d1f24dd304c363a1bde97b5af618b46edc49)
2008-01-04 22:09:36 +01:00
Michael Adam
4ad3464fb9
Unindent function header.
...
Michael
(This used to be commit cafda34783f0961c9b463803c19cfcb69f836e3f)
2008-01-04 22:09:35 +01:00
Michael Adam
3f42428f9b
Fix a misleading DEBUG message.
...
At this stage, the (tcp) connection to the LDAP server has not
been established, this is what is about to be attempted. What
has been succesfully done, is a CLDAP netlogon query.
Michael
(This used to be commit 71c3c8ad4c92c5f6267b84ee1d207e5e49e9a4ec)
2008-01-04 22:09:35 +01:00
Jeremy Allison
e49c28e604
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
...
(This used to be commit 16224e8f4f22a8db0ed278d741a7706967f55335)
2008-01-04 12:59:36 -08:00
Jeremy Allison
9254bb4ef1
Refactor the crypto code after a very helpful conversation
...
with Volker. Mostly making sure we have data on the incoming
packet type, not stored in the smb header.
Jeremy.
(This used to be commit c4e5a505043965eec77b5bb9bc60957e8f3b97c8)
2008-01-04 12:56:23 -08:00
Michael Adam
2f195e52fa
Fix a DEBUG statement.
...
Michael
(This used to be commit 18360b852c662d933ceff9854725f878a5de9a7d)
2008-01-04 21:35:29 +01:00
Michael Adam
517ad5318d
Fix spacing - spaces mixed with tabs.
...
Michael
(This used to be commit a4ef828102417f04af1e9823c89404e77e4fd5c1)
2008-01-04 21:16:48 +01:00
Michael Adam
dbdaa5eeec
Fix a comment.
...
Michael
(This used to be commit fc9c3f39b5af55026f1e5e964857c203cf6c9316)
2008-01-04 21:09:55 +01:00
Michael Adam
dee8e32d8d
Remove the word "registry" from the help output of the "net conf" command.
...
Michael
(This used to be commit 8d9e3e08f3cc6a1f54661d1e54a3902ad50be191)
2008-01-04 21:05:59 +01:00
Michael Adam
34fb783965
Update the introductory comment to net_conf.c to mention linbet_conf.
...
Michael
(This used to be commit e166b886375b450534c894676ab1f64571dd46b8)
2008-01-04 21:05:59 +01:00
Gerald (Jerry) Carter
84a50e2154
Fix the inherited trust flags when spidering the trust heirarchy.
...
Also *do not* clear the trust list when rescanning or else it is possible
to suffer from a race condition where no trusted domains can be found.
(This used to be commit e7164a252bf213a74d6eeac5aa04645eed5be241)
2008-01-04 13:35:41 -06:00
Gerald (Jerry) Carter
4093b0632c
Add a missing check for dealing with a one-way trust in query_user().
...
(This used to be commit f89e356bdaa203ef0a3ce6b8bd52170afa68a2c9)
2008-01-04 13:34:10 -06:00
Gerald (Jerry) Carter
bcc2a6a9d7
Ensure that winbindd_getgroups() can deal with a UPN name.
...
A user logging in via GDM was not getting a complete list of supplementary
groups in his/her token. This is because getgroup() was not able to
find the winbindd_domain* using the DNS name. Fallback to matching the DNS
name is the short name match failes.
(This used to be commit 2030a8de19a2c7c735a8aa367dd953e4a5c447b8)
2008-01-04 13:32:58 -06:00
Gerald (Jerry) Carter
9a45dcef4d
When connecting to an AD DC, use the DsGetDCName variant.
...
This allows us to deal with child domains in transitive forest trusts.
It also allows us to fill in the forest name to the target domain to the
struct winbindd_domain *.
(This used to be commit ed30516bb0f55f9ba466debf91b6e33d1c28a484)
2008-01-04 13:31:07 -06:00
Michael Adam
f215dec831
Map WERR_NO_SUCH_SERVICE with dos_errstr().
...
Michael
(This used to be commit df5839b5376e903486982ddc7c4f4fbd4550c60a)
2008-01-04 19:58:19 +01:00