s4-upgradedns: Make sure the attribute exists before accessing it
authorAmitay Isaacs <amitay@gmail.com>
Wed, 28 Mar 2012 06:49:09 +0000 (17:49 +1100)
committerAmitay Isaacs <amitay@samba.org>
Wed, 28 Mar 2012 08:27:40 +0000 (10:27 +0200)
Autobuild-User: Amitay Isaacs <amitay@samba.org>
Autobuild-Date: Wed Mar 28 10:27:40 CEST 2012 on sn-devel-104

source4/scripting/bin/samba_upgradedns

index 1a42e0c8cefe7a73671cfef875969ace5554f9e2..86172a762d8844e563c79f3ca813577a756f845b 100755 (executable)
@@ -379,12 +379,16 @@ if __name__ == '__main__':
         msg = msgs[0]
 
         master_nclist = []
-        for nc in msg["msDS-hasMasterNCs"]:
-            master_nclist.append(nc)
+        ncs = msg.get("msDS-hasMasterNCs")
+        if ncs:
+            for nc in ncs:
+                master_nclist.append(nc)
 
         partial_nclist = []
-        for nc in msg["hasPartialReplicaNCs"]:
-            partial_nclist.append(nc)
+        ncs = msg.get("hasPartialReplicaNCs")
+        if ncs:
+            for nc in ncs:
+                partial_nclist.append(nc)
 
         modified = False
         for nc in dns_nclist: