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

72950 Commits

Author SHA1 Message Date
Andrew Tridgell
628fcd111a s3-events: tevent_internal.h is not a public header
We need to use the "foo.h" form instead of the <foo.h> form for
headers that are not installed publicly. Otherwise when an external
version of tevent is used we won't find the header and the build will
fail.

Note that this creates a structure dependency between the
tevent structures in the external library and the headers in our
source tree. That is not ideal, but is currently OK as the waf build
will only use the external library if it is at least the same version
as the internal tree, which means it will actually be the same
version, as we release the external version from our tree.

We should come up with a better solution, but for now this allows
openchange to build again.

Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Tue May 10 16:06:40 CEST 2011 on sn-devel-104
2011-05-10 16:06:40 +02:00
Volker Lendecke
44cc165627 s3: Use tevent_req_ntstatus properly in a few places
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Tue May 10 13:11:10 CEST 2011 on sn-devel-104
2011-05-10 13:11:10 +02:00
Volker Lendecke
06a2ff5796 s3: Use tevent_req_ntstatus properly in a few places 2011-05-10 12:10:25 +02:00
Rusty Russell
87e3542174 async_smb.c: convert cli->timeout properly
I have a test failure on my 32-bit Ubuntu system, in that
samba3.smbtorture_s3.plain(s3dc).LOCK9 immediately times out (rather than
waiting 5 seconds for the child).

Debugging revealed this code: timeout is in ms and is set to > 1000 in
various places.  The code dates from 2002, and other perturbations didn't
reveal why it breaks now, but fix it anyway.

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

Autobuild-User: Rusty Russell <rusty@rustcorp.com.au>
Autobuild-Date: Tue May 10 12:09:07 CEST 2011 on sn-devel-104
2011-05-10 12:09:07 +02:00
Rusty Russell
0d93eb8f55 tdb_wrap.h: not a public header.
It is a private library, and OpenChange has their own which they use, so
it's not for them either.

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

Autobuild-User: Rusty Russell <rusty@rustcorp.com.au>
Autobuild-Date: Tue May 10 05:21:19 CEST 2011 on sn-devel-104
2011-05-10 05:21:19 +02:00
Rusty Russell
7deeacae2b gencache: don't use CLEAR_IF_FIRST as fallback.
CLEAR_IF_FIRST only works if *all* openers use that flag.

So just truncate the file: it's racy, but that's what we're doing anyway.

We'd really need a TDB_OPENCHECK_OR_CLEAR flag to do this properly (or in
TDB2, a open hook at the right point).

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2011-04-19 12:06:05 +09:30
Rusty Russell
3ccfe7cb7b Add -fno-common where supported (WAF only)
Normally under UNIX, uninitialized non-static global variables get
placed in the "common" section, where they are merged at link time.
This means if two C files define "int debug", they will end up
referring to the same variable.  Or if one does "float level" and the
other does "int level" you'll get an accidental union.

Such bugs can be hard to track down; fortunately GCC offers
-fno-common to disable this feature.  It didn't reveal any places
which need fixing, however).

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2011-05-10 11:37:30 +09:30
Andrew Bartlett
14f99167f6 build: Remove --disable-s3build so we can rely on these subsystems
This will make it easier to write code that uses the whole codebase.

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Mon May  9 12:25:33 CEST 2011 on sn-devel-104
2011-05-09 12:25:33 +02:00
Andrew Bartlett
7e8f086798 s3-build: Move generated config.h and config.h.in to include/autoconf
This ensures that these are not found by the waf build, which causes
issues when the wrong config.h is used by the recursive smbtorture build

Andrew Bartlett
2011-05-09 11:21:09 +02:00
Volker Lendecke
8aab926c28 tevent: Fix a typo
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Mon May  9 08:17:08 CEST 2011 on sn-devel-104
2011-05-09 08:17:08 +02:00
Samba-JP oota
1cb16a0000 s3: Fix a typo 2011-05-09 07:14:05 +02:00
Andrew Bartlett
d957fd5ae7 selftest: Test both users created in plugin_s4_dc environment
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Mon May  9 06:10:52 CEST 2011 on sn-devel-104
2011-05-09 06:10:52 +02:00
Andrew Bartlett
a2caad24a1 selftest: don't override just-added username in plugin_s4_dc test
This will allow us to test a user added via smbpasswd as well as the
administrator added by provision.

Andrew Bartlett
2011-05-09 05:06:12 +02:00
Kai Blin
05d00ed479 nsswitch: Fix build check logic
Only build pam_winbind.so if we want pam modules _and_ have the libs

Autobuild-User: Kai Blin <kai@samba.org>
Autobuild-Date: Sun May  8 23:56:33 CEST 2011 on sn-devel-104
2011-05-08 23:56:33 +02:00
Kamen Mazdrashki
ecc030e289 selftest: Polish selftest-vars.sh a little so it can be used again
Autobuild-User: Kamen Mazdrashki <kamenim@samba.org>
Autobuild-Date: Sun May  8 22:50:01 CEST 2011 on sn-devel-104
2011-05-08 22:50:01 +02:00
Andrew Bartlett
5def7a1e5e s4-selftest Add tests for proxy_samba4_dc
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Sun May  8 20:03:45 CEST 2011 on sn-devel-104
2011-05-08 20:03:45 +02:00
Andrew Bartlett
f4d9b40d7f selftest: Make the ncalrpc dir common between Samba4 and Samba3.
This also avoids creating the directory, as the startup routines will
create it with the correct permissions.

Andrew Bartlett
2011-05-08 19:00:29 +02:00
Andrew Bartlett
aae9353ecf ncalrpc: Force ncalrpc dir to be mode 755 in all users
This allows this directory to be shared between Samba3 and Samba4 in a
Franky-style setup easily.

Andrew Bartlett
2011-05-08 19:00:29 +02:00
Andrew Bartlett
eae061293b selftest: Add plugin_s4_dc environment
This environment uses pdb_samba4 and auth_samba4 to plug these
critical subsystems into a mixed Samba3/Samba4 DC, in a similar way to
the 'Franky' proposal.

Andrew Barltett
2011-05-08 19:00:28 +02:00
Andrew Bartlett
f52c6eeacc s3-auth Add auth_samba4 module
This module makes a direct call into the Samba4 auth stack to
authenticate Samba4 uses in a Samba3 file server.  The direct call
avoids the need to obtain schannel credentials.

Andrew Bartlett

Pair-Programmed-With: Andrew Tridgell <tridge@samba.org>
2011-05-08 19:00:28 +02:00
Andrew Bartlett
a47c7f6b4c s3-passdb: added pdb_samba4
This uses direct LDB operations and calls to the dsdb library to allow
passdb operations (such as pdbedit and smbpasswd) offline, and uses
transactions internally for database consistency.

Pair-Programmed-With: Andrew Tridgell <tridge@samba.org>
2011-05-08 19:00:28 +02:00
Andrew Bartlett
25cfa29e29 s3-passdb Redirect domain GUID and SID queries to the passdb stack
This is done if the passdb module supports PDB_ADS, and ensures that a
random SID is never made up locally for these directories.

This is only enabled when in the waf build, due to dependency issues.

Andrew Bartlett
2011-05-08 17:48:33 +02:00
Andrew Bartlett
5d2ce400d2 s4-dsdb Add transactions to dsdb modify helpers 2011-05-08 17:36:26 +02:00
Andrew Bartlett
8882dab93e s4-samr Remove incorrect transaction_cancel() in error path
The transactions are now handled entirely within dsdb_add_user()

Andrew Bartlett
2011-05-08 17:36:25 +02:00
Andrew Bartlett
ac82ac4b83 s4-param cope with doulbe-parsing of -foo and +foo lists
For some reason these lists are parsed twice, and so any -foo was
failing as it was already removed the first time.

Andrew Bartlett
2011-05-08 17:36:25 +02:00
Andrew Bartlett
d1df1cb714 build: Allow the C code to know if this is a waf build
This allows addition of functionality that can't be handled (for
example, due to dependencies) in the autoconf build.

Andrew Bartlett
2011-05-08 17:36:25 +02:00
Andrew Tridgell
c596d85afd s4-interfaces: keep interfaces in the order they were declared
the spoolss notify test depends on the interfaces order

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Sun May  8 13:57:58 CEST 2011 on sn-devel-104
2011-05-08 13:57:58 +02:00
Andrew Tridgell
64adea3d85 s3-test: build smbtorture with --enable-developer
this makes debugging of tests much easier, as we get debug symbols
2011-05-08 12:57:04 +02:00
Andrew Bartlett
8a07ec7bab lib/socket: Remove outdated comment
The autoconf and waf tests for interfaces logic are in libreplace now.
2011-05-08 12:57:04 +02:00
Andrew Bartlett
22cb631b4f s4-interfaces Rename interfaces code so not to conflict with source3/
The iface_count, iface_n_bcast, and load_interfaces functions
conflicted with functions of the same name in source3, so the source4
functions were renamed.  Hopefully we can actually wrap one around the
other in future.

Andrew Bartlett
2011-05-08 12:57:04 +02:00
Andrew Bartlett
897ef820a4 s3-lib Use common lib/socket code for get_interfaces() et al 2011-05-08 12:57:04 +02:00
Andrew Bartlett
f346a73785 lib/socket move interfaces code to the top level 2011-05-08 12:57:04 +02:00
Andrew Bartlett
879498b362 s4-lib/socket Samba4 is not IPv6 compatible
Don't add IPv6 interfaces until we actually support them.

I'll soon have IPv6 service at home, and then I'll make it my buisness
to sort this out once and for all.

Andrew Bartlett
2011-05-08 12:57:03 +02:00
Andrew Bartlett
5a8b6ac4c0 s4-lib merge get_interfaces() from Samba3 to Samba4 2011-05-08 12:57:03 +02:00
Andrew Tridgell
45e26fdeec s3-smbd: expose smbd_set_server_fd()
this allows the fd to be setup by subsystems that want to use the s3
server core code

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Sun May  8 12:01:13 CEST 2011 on sn-devel-104
2011-05-08 12:01:13 +02:00
Andrew Tridgell
2c569cd8ba s3-waf: expose the server_exit code in the smbd_base library
these functions are called from the rest of smbd_base
2011-05-08 11:00:23 +02:00
Andrew Tridgell
7e4ba48135 build: allow s3 libraries to be built with no undefined symbols
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-05-08 10:59:18 +02:00
Andrew Bartlett
958368efd0 s4-param Don't set variables such as the debuglevel unless global
This ensures that when a second lp_ctx is created, that it does not
set global variables such as the debug level, log file etc,
potentially overriding the settings created by another context.

In particular this matters when loading Samba4 modules into Samba3.

Andrew Bartlett
2011-05-08 10:56:28 +02:00
Andrew Bartlett
f946668b7a Improve debug messages when creating socket directories
This makes clear what the permissions error and directory name actually is

Andrew Bartlett
2011-05-08 10:56:28 +02:00
Andrew Tridgell
8b2ba64d60 libds: moved enum security_types to a common header
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-05-08 10:56:27 +02:00
Andrew Bartlett
c3bb5b04e2 s3-utils Set dyn_CONFIGFILE from -c on smbpasswd command line
This is similar to the code in popt_common and allows the smb.conf to
be re-loaded from this file later in the code (or for Samba4 plugins
to attempt to parse the same smb.conf).

Andrew Bartlett
2011-05-08 10:56:27 +02:00
Andrew Bartlett
3eb1023d52 selftest Use die() less often, as it fails to allow cleanup 2011-05-08 10:56:27 +02:00
Andrew Bartlett
6990536000 auth: allow auth_common.h to be included multiple times without error 2011-05-08 10:56:27 +02:00
Andrew Bartlett
ea0ac9cdfc s4-auth Rename auth -> auth4 to avoid conflict with s3 auth 2011-05-08 10:56:26 +02:00
Andrew Bartlett
1969aa8eac s4-ntvfs: Rename brl_*() -> brlock_*() to avoid conflict with brlock_init in s3 2011-05-08 10:56:26 +02:00
Andrew Tridgell
5c3e985fb5 s4-auth: remove unused prototype 2011-05-08 10:56:26 +02:00
Volker Lendecke
622faa2687 s3: Fix including libsmb/proto.h without prior ads.h
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Sat May  7 11:38:11 CEST 2011 on sn-devel-104
2011-05-07 11:38:11 +02:00
Gordon Ross
ac25835ab7 Fix Samba3 on OpenIndiana.
I'd like Samba to use the native OpenLDAP and MIT Kerberos libs.
Attached are some patches to do that. (relative to git master)
It does not build for me without these.

(OpenIndiana is an off-shoot of OpenSolaris  See http://www.openindiana.org)

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Sat May  7 02:20:14 CEST 2011 on sn-devel-104
2011-05-07 02:20:14 +02:00
Jeremy Allison
f7b3909103 A couple more off-by-one calculations with strlcpy.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Fri May  6 18:39:17 CEST 2011 on sn-devel-104
2011-05-06 18:39:17 +02:00
Günther Deschner
fa8490aa4c s4-smbd: fix randseed_init() usage.
Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Fri May  6 17:37:11 CEST 2011 on sn-devel-104
2011-05-06 17:37:11 +02:00