1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
samba-mirror/source4
Tim Beale f196897bc8 replmd: Handle conflicts for single-valued link attributes better
If 2 DCs independently set a single-valued linked attribute to differing
values, Samba should be able to resolve this problem when replication
occurs.

If the received information is better, then we want to set the existing
link attribute in our DB as inactive.

If our own information is better, then we still want to add the received
link attribute, but mark it as inactive so that it doesn't clobber our
own link.

This still isn't a complete solution. When we add the received attribute
as inactive, we really should be incrementing the version, updating the
USN, etc. Also this only deals with the case where the received link is
completely new (i.e. a received link conflicting with an existing
inactive link isn't handled).

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

Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2017-10-20 04:05:21 +02:00
..
auth s4:auth/ntlmssp: add support for using "winbind" as DC 2017-08-07 15:20:03 +02:00
build/pasn1
cldap_server source4/smbd: refactor the process model for prefork 2017-10-19 05:33:09 +02:00
client s4: cifsdd: Allocate the event context off NULL, not talloc_autofree_context(). 2017-05-13 16:50:13 +02:00
cluster Remove callers of lp_use_ntdb 2015-03-17 11:30:51 +01:00
dns_server source4/smbd: Do not overstamp the process model with "single" 2017-10-19 05:33:10 +02:00
dsdb replmd: Handle conflicts for single-valued link attributes better 2017-10-20 04:05:21 +02:00
echo_server source4/smbd: Do not overstamp the process model with "single" 2017-10-19 05:33:10 +02:00
heimdal HEIMDAL: don't bother seeing q if not sent 2017-08-28 15:10:54 +02:00
heimdal_build s4:heimdal_build: there's no need to define HAVE_KRB5_ADDRESSES twice 2017-10-11 12:33:42 +02:00
include lib: Remove global xfile.h includes 2016-11-20 06:23:19 +01:00
kdc source4/smbd: Do not overstamp the process model with "single" 2017-10-19 05:33:10 +02:00
ldap_server source4/smbd: Do not overstamp the process model with "single" 2017-10-19 05:33:10 +02:00
lib python: Port samba.registry module to Python 3 compatible form 2017-10-18 10:20:26 +02:00
libcli Make sure smbtorture tests can run if someone has set their min protocol above NT1. 2017-09-20 22:48:15 +02:00
libnet debug: Add new debug class "drs_repl" for DRS replication processing 2017-09-07 06:56:27 +02:00
librpc Install dcerpc/__init__.py for all Python environments 2017-09-14 22:29:39 +02:00
nbt_server source4/smbd: refactor the process model for prefork 2017-10-19 05:33:09 +02:00
ntp_signd source4/smbd: Do not overstamp the process model with "single" 2017-10-19 05:33:10 +02:00
ntvfs s4:auth/unix_token: remove unused tevent_context from security_token_to_unix_token() 2017-06-26 08:47:15 +02:00
param source4/provision: fix talloc_steal on unallocated memory 2017-05-25 02:25:13 +02:00
rpc_server source4/smbd: refactor the process model for prefork 2017-10-19 05:33:09 +02:00
script find_unused_macros: Remove obsolete script that finds unused macros. 2014-08-31 21:21:13 +02:00
scripting python: add a failed test to show Popen deadlock 2017-10-19 05:33:10 +02:00
selftest tests: Add a blackbox test for smbcontrol 2017-10-19 05:33:09 +02:00
setup provision: Add a fixed GUID to the samba4top objectclass definition 2017-09-23 05:26:15 +02:00
smb_server source4/smbd: refactor the process model for prefork 2017-10-19 05:33:09 +02:00
smbd s4:smbd: Add missing unistd.h include to fix build of process_prefork 2017-10-19 23:41:11 +02:00
torture replmd: Partial fix for single-valued link conflict 2017-10-20 04:05:20 +02:00
utils man pages: change http://samba.org to https://www.samba.org 2016-12-09 13:10:26 +01:00
web_server source4/smbd: Do not overstamp the process model with "single" 2017-10-19 05:33:10 +02:00
winbind source4/smbd: refactor the process model for prefork 2017-10-19 05:33:09 +02:00
wrepl_server source4/smbd: Do not overstamp the process model with "single" 2017-10-19 05:33:10 +02:00
.clang_complete
.valgrind_suppressions
wscript_build Do not install smbclient4 and nmblookup4 2014-04-15 03:25:13 +02:00