diff options
| author | Matthieu Patou <mat@matws.net> | 2010-09-18 08:15:36 +0400 |
|---|---|---|
| committer | Matthieu Patou <mat@matws.net> | 2010-09-26 06:22:43 +0400 |
| commit | 76d87b7fb51dfab8f85686bde7fed67701bc9092 (patch) | |
| tree | 1185591e964ed682d1cc0e2e52ed5b9a31714cf5 /source4 | |
| parent | 3c95d4d31347a2491d2c2f593f2e12f9a389e66c (diff) | |
| download | samba-76d87b7fb51dfab8f85686bde7fed67701bc9092.tar.gz samba-76d87b7fb51dfab8f85686bde7fed67701bc9092.tar.bz2 samba-76d87b7fb51dfab8f85686bde7fed67701bc9092.zip | |
s4 upgradeprovision: fix a bug with empty reference objects
Thanks to lukas@eecs.qmul.ac.uk for poiting it to me
Diffstat (limited to 'source4')
| -rwxr-xr-x | source4/scripting/bin/upgradeprovision | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision index 3c02569ba3..7dda6b67a6 100755 --- a/source4/scripting/bin/upgradeprovision +++ b/source4/scripting/bin/upgradeprovision @@ -852,8 +852,16 @@ def update_present(ref_samdb, samdb, basedn, listPresent, usns, invocationid): # We have updated by provision usn information so let's exploit # replMetadataProperties if att in forwardlinked: + if current[0].get(): + curval = current[0][att] + else: + curval = () + if reference[0].get(): + refval = reference[0][att] + else: + refval = () handle_links(samdb, att, basedn, current[0]["dn"], - current[0][att], reference[0][att], delta) + curval, refval, delta) if isFirst == 0 and len(delta.items())>1: isFirst = 1 |