1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Commit Graph

78741 Commits

Author SHA1 Message Date
Andrew Bartlett
5c9b6db68e s3-gse: Use the session key type, not the lucid context to set NEW_SPNEGO
Using gss_krb5_export_lucid_sec_context() is a problem with MIT krb5, as
it (reasonably, I suppose) invalidates the gssapi context on which it
is called.  Instead, we look to the type of session key which is
negotiated, and see if it not AES (or newer).

If we negotiated AES or newer, then we set GENSEC_FEATURE_NEW_SPENGO
so that we know to generate valid mechListMic values in SPNEGO.

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-02-16 15:18:42 +01:00
Andrew Bartlett
1d0684c845 s3-librpc: Remove unused bool gensec_hook
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-02-16 15:18:42 +01:00
Stefan Metzmacher
0c5cbb557b s3:rpc_client: fix comment
metze
2012-02-16 15:18:41 +01:00
Andrew Bartlett
bd2a7aac2c s3-librpc: make gensec result handling more generic
This prepares us for handling SPNEGO via gensec

Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-02-16 15:18:41 +01:00
Michael Adam
a389632e1c wafsamba: exclude '.brzignore' from "make dist"
.bzrignore can cause unwanted effects, if one e.g. maintains
a packaging (like debian) of the generated distribution in bzr.

Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Thu Feb 16 13:47:52 CET 2012 on sn-devel-104
2012-02-16 13:47:51 +01:00
Michael Adam
e0797c6c9a wafsamba: exclude '.gitignore' from "make dist"
.gitignore can cause unwanted effects, if one e.g. maintains
a packaging (like debian) of the generated distribution in git
2012-02-16 12:09:55 +01:00
Michael Adam
56747249ca wafsamba: fix blacklist handling in "make dist" 2012-02-16 12:07:50 +01:00
Michael Adam
8ca39dfbe1 s4:provision: only print the adminpass if it was generated (not user-provided) 2012-02-16 12:07:50 +01:00
Michael Adam
09b865b2f0 s4:provision: generate the adminpass provision() instead of provision_fill()
so that the adminpass can be logged at the end
(otherwise we get "None")
2012-02-16 12:07:49 +01:00
Michael Adam
32cf164d99 s4:provision: don't log the ldap admin password - it is internal only 2012-02-16 12:07:49 +01:00
Björn Baumbach
ea27879dd0 s4-scripting: samba-tool: Fix domain info usage message
Signed-off-by: Michael Adam <obnox@samba.org>
2012-02-16 12:07:32 +01:00
Björn Baumbach
83d0a860a1 s4-selftest: fix output of opened connections in torture_holdcon
Signed-off-by: Michael Adam <obnox@samba.org>
2012-02-16 12:07:32 +01:00
Christopher R. Hertel (crh)
b5b204184a Rename obscure defined constants.
Replaced the undescriptive SMB_PORT1 and SMB_PORT2 defined constants
with the slightly more descriptive names NBT_SMB_PORT and TCP_SMB_PORT.
Also replaced several hard-coded references to the well-known port
numbers (139 and 445, respectively) as appropriate.

Small changes to clarify some comments regarding the two transport
types.

Signed-off-by: Simo Sorce <idra@samba.org>

Autobuild-User: Simo Sorce <idra@samba.org>
Autobuild-Date: Thu Feb 16 08:29:41 CET 2012 on sn-devel-104
2012-02-16 08:29:41 +01:00
Andrew Bartlett
95d3096f98 s3-selftest: Remove .posix_s3 from s3 test names
As far as I can tell, this simply referred to the posix_s3.sh script
that originally ran these tests.

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Thu Feb 16 06:57:09 CET 2012 on sn-devel-104
2012-02-16 06:57:08 +01:00
Andrew Bartlett
7e0e713406 selftest: Remove 'if have_ads_support:' from tests.py
The selftest system now skips launching these if the environment is not available.

Andrew Bartlett
2012-02-16 15:21:11 +11:00
Andrew Bartlett
3cf091cf68 s3-smbd: Avoid starting log lines with the word 'error' 2012-02-16 15:21:11 +11:00
Andrew Bartlett
6917575fe3 selftest: skip plugin_s4_dc if we do not have ADS 2012-02-16 15:21:10 +11:00
Andrew Bartlett
8ea068d702 selftest: Run nsstest against more environments 2012-02-16 15:21:10 +11:00
Andrew Bartlett
c006b9b898 selftest: skip targets that are not compiled in if we do not have ADS 2012-02-16 15:21:10 +11:00
Andrew Bartlett
212b3ec1a0 s3-selftest: Require SMB signing for ktest environment
This will help weed out session key errors in the krb5 code.

Andrew Bartlett
2012-02-16 15:21:10 +11:00
Andrew Bartlett
22a2c46f84 selftest: Do not start up an already-running test environment
Otherwise we may re-provision the dc just because we started it via s3member or s4member
first.

Andrew Bartlett
2012-02-16 15:21:10 +11:00
Andrew Bartlett
e1f9fb79c7 selftest: Make plugin_s4_dc set the cached environment correctly 2012-02-16 15:21:10 +11:00
Andrew Bartlett
a8a83611f0 wintest: update WinXP-1 snapshot 2012-02-16 15:20:10 +11:00
Andrew Bartlett
8f6ddb3c02 wintest: Change Windows 7 VM 2012-02-16 15:20:10 +11:00
Andrew Bartlett
61ccb465db wintest: Give the Windows VM a little more time to start back up 2012-02-16 15:20:10 +11:00
Andrew Bartlett
de2bb2a7f8 wintest: Samba is now all version 4.0 2012-02-16 15:20:09 +11:00
Andrew Bartlett
98e438df00 wintest: Cope with nc not timing out even when -w 1 is specified 2012-02-16 15:20:09 +11:00
Andrew Bartlett
97859d1ce8 wintest: s3 moved smb.conf to /etc 2012-02-16 15:20:09 +11:00
Andrew Bartlett
81ddb83943 wintest: Update VM used for W2K8R2A 2012-02-16 15:20:09 +11:00
Andrew Bartlett
15a0de66cb wintest: Allow access denied when turning off the firewall 2012-02-16 15:20:09 +11:00
Andrew Bartlett
2ba57f42b8 wintest: Retry joining the domain a few times 2012-02-16 15:20:09 +11:00
Andrew Bartlett
032a2c4ce3 wintest: connect to correct hostname in test_net_use 2012-02-16 15:20:09 +11:00
Andrew Bartlett
00f86a36e0 s3-nmbd: Initialise newly non-static variables
Found by testing with wintest.  When the variables were made non-static in
c21f6a1c68 the implicit initialisation to 0
was lost.

Andrew Bartlett
2012-02-16 15:20:08 +11:00
Volker Lendecke
dd5868d41e s3: Add SERVERID_UNIQUE_ID_NOT_TO_VERIFY, bug 8760
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Wed Feb 15 21:10:22 CET 2012 on sn-devel-104
2012-02-15 21:10:22 +01:00
David Disseldorp
a6bd7f3d57 s3-printing: fix crash in printer_list_set_printer()
The printer list database format was recently changed to accommodate for
the printcap location field.
One of the tdb_pack calls is not provided with a location string
argument, this causes a crash on some platforms.

https://bugzilla.samba.org/show_bug.cgi?id=8762

Signed-off-by: Günther Deschner <gd@samba.org>
Signed-off-by: Jim McDonough <jmcd@samba.org>
Signed-off-by: Lars Müller <lars@samba.org>

Autobuild-User: David Disseldorp <ddiss@samba.org>
Autobuild-Date: Wed Feb 15 19:34:38 CET 2012 on sn-devel-104
2012-02-15 19:34:38 +01:00
Volker Lendecke
9e25361203 tevent_signal: Fix a valgrind error
This fixes an uninitialized read introduced by my fix for the tevent_signal
destructors. From looking at the code you might believe that this kicks in only
when talloc failed. But with -O3 I do see it in normal operations.

Sorry for that.

Autobuild-User: Volker Lendecke <vl@samba.org>
Autobuild-Date: Wed Feb 15 17:58:37 CET 2012 on sn-devel-104
2012-02-15 17:58:36 +01:00
Volker Lendecke
740d4d7550 s3: files_struct->mode is only written, remove it
Autobuild-User: Volker Lendecke <vl@samba.org>
Autobuild-Date: Tue Feb 14 19:14:29 CET 2012 on sn-devel-104
2012-02-14 19:14:29 +01:00
Rusty Russell
4d58d0fa8f tdb: build and run unit tests in tdb/test/
Now we can build the test binaries: the CCAN style is to compile
everything called "compile_ok*.c", compile and run everything called
"run*.c", compile, link with the module, and run everything called
"api*.c", and link any other C files (presumably test helpers) into
all the tests.

Unfortunately, actually passing that between the various parts of
wscript is painful, so I open-coded the names.

Also, the tests expect to be run in a (temporary) directory they can
pollute, with the test directory found in test/ (to find the canned
TDB files, for example).

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

Autobuild-User: Rusty Russell <rusty@rustcorp.com.au>
Autobuild-Date: Tue Feb 14 06:53:46 CET 2012 on sn-devel-104
2012-02-14 06:53:46 +01:00
Rusty Russell
205242e176 tdb/test: fix up tests for use in SAMBA tdb code.
1) Make sure we include "tdb_private.h" first, to get the right headers
   (esp. the correct setting of _FILE_OFFSET_BITS before unistd.h).
2) Fix 3G file test since expand logic has changed.
3) Fix nested transaction test, since default is to allow nesting.
4) Capture fdatasync, which was slowing down transaction expand.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2012-02-14 14:45:21 +10:30
Rusty Russell
8fa345d952 tdb: wean CCAN-style unit tests off of tap.
We could use subunit, but that's overkill.  Just print messages when
we fail, and use exit status.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2012-02-14 14:45:19 +10:30
Rusty Russell
0802791081 tdb: import unit tests from CCAN into tdb/test/
I pulled tdb into CCAN as an experiment a while ago; it doesn't belong
there, but it has accumulated some important unit tests.

These are copied from CCAN version init-1486-gc438ec1 with #include "../"
changed to #include "../common/".

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2012-02-14 04:05:43 +10:30
Rusty Russell
390b9a2dd8 tdb: make tdb_private.h idempotent.
The most convenient way to write unit tests in C is to directly
#include the C files (CCAN uses this, for example).  That works quite
well, but it means that tdb_private.h now needs to be protected
against multiple inclusions.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2012-02-14 04:04:43 +10:30
Christian Ambach
ad2a2c4e3a s4:torture: add another SMB2 rename test
this mimics Word 2010 saving a file

Autobuild-User: Christian Ambach <ambi@samba.org>
Autobuild-Date: Mon Feb 13 18:33:43 CET 2012 on sn-devel-104
2012-02-13 18:33:43 +01:00
Volker Lendecke
e34e95feae libndr: Add ndr_map_error2errno
Autobuild-User: Volker Lendecke <vl@samba.org>
Autobuild-Date: Mon Feb 13 15:06:29 CET 2012 on sn-devel-104
2012-02-13 15:06:28 +01:00
Sumit Bose
0f22e35028 s3-auth: On successful user mapping set mapped_to_guest to false.
Autobuild-User: Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date: Mon Feb 13 13:09:10 CET 2012 on sn-devel-104
2012-02-13 13:09:10 +01:00
Andrew Bartlett
cf155fa366 s3-selftest: Do not assume $USERNAME is the same as $DC_USERNAME
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Mon Feb 13 06:13:38 CET 2012 on sn-devel-104
2012-02-13 06:13:38 +01:00
Andrew Bartlett
70f4a96c68 selftest: Allow setup_env() to signal that an environment name is unknown
This will allow us to skip samba4 environments that may be mentioned in
the source3/selftest/tests.py file.

Andrew Bartlett
2012-02-13 04:41:05 +01:00
Andrew Bartlett
3bf922111a s3-build: expliticly require gssapi for HAVE_KRB5 and remove HAVE_GSSAPI
The requirement for gss functions already make this happen, but
this is clearer.  No code depends on HAVE_GSSAPI any more.

Andrew Bartlett
2012-02-13 04:41:05 +01:00
Andrew Bartlett
4a0d1b5ac6 s3-libads: Move to using only the HAVE_KRB5 define
HAVE_KRB5 already implies that GSSAPI is present as well.

Andrew Bartlett
2012-02-13 04:41:05 +01:00
Andrew Bartlett
310cf98574 s3-lib/addns: Move to system/kerberos.h and HAVE_KRB5 2012-02-13 04:41:05 +01:00