Age | Commit message (Collapse) | Author | Files | Lines |
|
Conflicts:
source/Makefile
source/auth/config.mk
source/auth/gensec/config.mk
source/build/m4/public.m4
source/build/make/python.mk
source/build/make/rules.mk
source/build/smb_build/header.pm
source/build/smb_build/main.pl
source/build/smb_build/makefile.pm
source/dsdb/config.mk
source/dsdb/samdb/ldb_modules/config.mk
source/kdc/config.mk
source/lib/events/config.mk
source/lib/events/events.c
source/lib/ldb/config.mk
source/lib/nss_wrapper/config.mk
source/lib/policy/config.mk
source/lib/util/config.mk
source/libcli/smb2/config.mk
source/libnet/config.mk
source/librpc/config.mk
source/nbt_server/config.mk
source/ntptr/ntptr_base.c
source/ntvfs/posix/config.mk
source/ntvfs/sysdep/config.mk
source/param/config.mk
source/rpc_server/config.mk
source/rpc_server/service_rpc.c
source/scripting/ejs/config.mk
source/scripting/python/config.mk
source/smb_server/config.mk
source/smbd/server.c
source/torture/config.mk
source/torture/smb2/config.mk
source/wrepl_server/config.mk
(This used to be commit 13bbd420681519894a4036729c43273912c9b402)
|
|
(This used to be commit 5f3a70f285ad8a412105c0e498e486f93fc279bc)
|
|
(This used to be commit ece878c1f9251b83598508e23ce0015b4db72f0a)
|
|
(This used to be commit b4e1ae07a284c044704322446c94351c2decff91)
|
|
Andrew Bartlett
(This used to be commit 0df2b3e0b56007850cf83cfdcdb45ca29e162d34)
|
|
(This used to be commit b659e83cd6b627dd0ae04064bccff7220a5bd1ce)
|
|
(This used to be commit 38ed501ac8993e84ea7f02d4633bc83b490dfe61)
|
|
Andrew Bartlett
(This used to be commit 19890c0d15adf4f099365f276a4bfdd3f4de52b6)
|
|
(This used to be commit 66327b8bd8dbde140b93f000a81ba13e743f27b0)
|
|
Andrew Bartlett
(This used to be commit ee6e4f8da229ddeca856a6db94236367aae06f63)
|
|
(This used to be commit ca72187b3e71a037780d42a57e46b60e75f724f6)
|
|
(This used to be commit f4de8d2c1c956bc85b91dc7aab20e5e7671f51bc)
|
|
(This used to be commit 88013ca9775a6ff5e5a393f9d8238dbcd197f26f)
|
|
(This used to be commit ecaa5bb83b5cf319718d15aff96152d70fa19f7f)
|
|
(This used to be commit 0239011ced6c864f85b47a342438228a8f6940ee)
|
|
(This used to be commit 799095b4e567f4495adf7d1d7bcb81dda6782959)
|
|
(This used to be commit 1ef3830bb0d6e91e3b00e880784ca0741d9b4d49)
|
|
(This used to be commit 8573e828d1b68c47b3c1754e9be230b2e78d9d52)
|
|
(This used to be commit 280339e3d126f5c72dc271051b72839fde0c5c9f)
|
|
(This used to be commit 524ec0796efebd48e7b5b2eb5fcc92ecc13c0071)
|
|
(This used to be commit 8be7d93735a357a3b73a1c4413d6fd9ec09b7555)
|
|
(This used to be commit 2f19f981449bf6f4d29f231259817c8b66104a9b)
|
|
(This used to be commit 92856d5054106894b65cd1a1b5119c0facfc4cff)
|
|
(This used to be commit 79854f0aa6a9899bb72d302cbca695b8b3a3b0dc)
|
|
(This used to be commit ceda3312a98b069d0711f3cb33de3ae71e91ebaa)
|
|
(This used to be commit 92751a73cd854365d365db854179bfd5aeabe7a2)
|
|
altogether.
(This used to be commit dbeab2a9cdee4e5f69afeb2603ba29cbed56debd)
|
|
(This used to be commit 2f8010582607ad7389cac3de4945ea0ee46941b3)
|
|
The new idmap world does not use the unixUser any more, so we need to
set up the entry (if wanted) in the idmap database. Users without a
backing unix user will get an allocated uid by idmap later.
Andrew Bartlett
(This used to be commit 8bd8bc1475ddf22d4702dcd17028a9043a5e629f)
|
|
Andrew Bartlett
(This used to be commit 416d2e3a5233f0c243e45857cfda5126c34ac265)
|
|
Andrew Bartlett
(This used to be commit b51b8a2d846284de4dff736fc18cf747c188de96)
|
|
When the user has an existing smb.conf, but no [netlogon] or [sysvol]
share, the provision script would trigger a traceback. While we still
need to abort in this situation, we do so now with a useful error.
Andrew Bartlett
(This used to be commit 10a8b7ea487f9725f69b02c4dd9cf5e1f67a23ab)
|
|
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
Conflicts:
source/torture/local/torture.c
(This used to be commit 5bf1c89cf8af08fbcf4f5089079920840daad7b8)
|
|
(This used to be commit 98c3d34eb233be284e8c8994cca337be25c72968)
|
|
(This used to be commit ca0e373e57eb225a1f5d96813e9ea9ccee971b96)
|
|
Andrew Bartlett
(This used to be commit d01d542502f25d6c731204ecb3d33720a1706581)
|
|
Leave filling in (we still initialise it) the secrets DB for the join
or vampire code.
Andrew Bartlett
(This used to be commit c93208c13ce91b334eadf0ea02fa41354e761e97)
|
|
(This used to be commit f8cac3735c9a19baa313c4b61abee144da303ce1)
|
|
(This used to be commit cae61e32e5b61a02c2986b74bd1d7e58460b1e80)
|
|
(This used to be commit c8dbf00b4490d804e1aac96a3fb66ff726bf9ef6)
|
|
(This used to be commit c0416a0b73f06ef57db1b83a75433e36b93a9981)
|
|
This option allows Fedora DS multi-master replication to work. I've
tried to update the wiki and scripts to the largely consistant with
each other.
Andrew Bartlett
(This used to be commit 42393c830733b2cc99ebccdafe944fcf3d82734f)
|
|
(This used to be commit 374654b43d9f9e8381991cedc433ce410a914f7a)
|
|
Conflicts:
source/auth/credentials/config.mk
source/auth/gensec/config.mk
source/build/smb_build/makefile.pm
source/heimdal_build/config.mk
source/lib/events/config.mk
source/lib/nss_wrapper/config.mk
source/lib/policy/config.mk
source/lib/registry/config.mk
source/lib/socket_wrapper/config.mk
source/lib/tdb/config.mk
source/lib/tls/config.mk
source/lib/util/config.mk
source/libcli/config.mk
source/libcli/ldap/config.mk
source/libnet/config.mk
source/librpc/config.mk
source/param/config.mk
source/rpc_server/config.mk
source/scripting/ejs/config.mk
source/smbd/process_model.mk
(This used to be commit 760378e0294dd0cd4523a83448328478632d7e3d)
|
|
(This used to be commit b6b7171f70114bd27ca8db09964c65cacb9cea92)
|
|
(This used to be commit ba3f0312f0dda47fb16ed9b8eee3750b209e0dad)
|
|
(This used to be commit 068c2f858a0c7e325cb8a1f2ca36e32b31fe1f77)
|
|
(This used to be commit 4319971ccb42618a3298a5f26f63fa4c9b255849)
|
|
In particular, allow for the server DN to be in a different site
(possible outcome of a DRS replication).
Andrew Bartlett
(This used to be commit 9ee4e39fe178317f42fd9a0adceea24b55dfe0f1)
|
|
Some distros seem to neither have a backup nor a staff group.
(This used to be commit 21fcf7c419658b3ae296428ca7a4ccf2288c17fe)
|