diff options
| author | Matthieu Patou <mat@matws.net> | 2010-01-12 15:43:39 +0300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-01-21 07:11:20 +1300 |
| commit | 4d6cda75e3f0536c71741051ae4c643d11ab95d8 (patch) | |
| tree | 277ac143aaf743a981f7b0d054f0a3e9413201e9 /source4 | |
| parent | 4c28e7ff0cbd9a1e8c981c9ee6f5c48a8c7a0002 (diff) | |
| download | samba-4d6cda75e3f0536c71741051ae4c643d11ab95d8.tar.gz samba-4d6cda75e3f0536c71741051ae4c643d11ab95d8.tar.bz2 samba-4d6cda75e3f0536c71741051ae4c643d11ab95d8.zip | |
upgradeprovision: reformat + add groupType as possibly overwritten
Diffstat (limited to 'source4')
| -rwxr-xr-x | source4/scripting/bin/upgradeprovision | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision index 9af8b2d189..0c33ee358e 100755 --- a/source4/scripting/bin/upgradeprovision +++ b/source4/scripting/bin/upgradeprovision @@ -71,20 +71,23 @@ CHANGEALL = 0xff # do not exist in the destination object). # This is most probably because they are populated automatcally when object is # created -hashAttrNotCopied = { "dn": 1,"whenCreated": 1,"whenChanged": 1,"objectGUID": 1,"replPropertyMetaData": 1,"uSNChanged": 1,\ - "uSNCreated": 1,"parentGUID": 1,"objectCategory": 1,"distinguishedName": 1,\ - "showInAdvancedViewOnly": 1,"instanceType": 1, "cn": 1, "msDS-Behavior-Version":1, "nextRid":1,\ - "nTMixedDomain": 1,"versionNumber":1, "lmPwdHistory":1, "pwdLastSet": 1, "ntPwdHistory":1, "unicodePwd":1,\ - "dBCSPwd":1,"supplementalCredentials":1,"gPCUserExtensionNames":1, "gPCMachineExtensionNames":1,\ +# This also apply to imported object from reference provision +hashAttrNotCopied = { "dn": 1,"whenCreated": 1,"whenChanged": 1,"objectGUID": 1,"replPropertyMetaData": 1,"uSNChanged": 1, + "uSNCreated": 1,"parentGUID": 1,"objectCategory": 1,"distinguishedName": 1, + "showInAdvancedViewOnly": 1,"instanceType": 1, "cn": 1, "msDS-Behavior-Version":1, "nextRid":1, + "nTMixedDomain": 1,"versionNumber":1, "lmPwdHistory":1, "pwdLastSet": 1, "ntPwdHistory":1, "unicodePwd":1, + "dBCSPwd":1,"supplementalCredentials":1,"gPCUserExtensionNames":1, "gPCMachineExtensionNames":1, "maxPwdAge":1, "mail":1, "secret":1,"possibleInferiors":1, "sAMAccountType":1} # Usually for an object that already exists we do not overwrite attributes as # they might have been changed for good reasons. Anyway for a few of them it's # mandatory to replace them otherwise the provision will be broken somehow. -hashOverwrittenAtt = { "prefixMap": replace, "systemMayContain": replace,"systemOnly":replace, "searchFlags":replace,\ - "mayContain":replace, "systemFlags":replace,"description":replace, - "oEMInformation":replace, "operatingSystemVersion":replace, "adminPropertyPages":replace, - "defaultSecurityDescriptor": replace,"wellKnownObjects":replace,"privilege":delete} +hashOverwrittenAtt = { "prefixMap": replace, "systemMayContain": replace,"systemOnly":replace, "searchFlags":replace, + "mayContain":replace, "systemFlags":replace,"description":replace, + "oEMInformation":replace, "operatingSystemVersion":replace, "adminPropertyPages":replace, + "defaultSecurityDescriptor": replace,"wellKnownObjects":replace,"privilege":delete,"groupType":replace} + + backlinked = [] def define_what_to_log(opts): |