KCC: correctly use dsa.new_connection() system_flags argument
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>
Wed, 10 Jun 2015 04:38:29 +0000 (16:38 +1200)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 29 Oct 2015 04:08:15 +0000 (05:08 +0100)
The dsa.system_flags attribute is important and gets saved in the
database, but was never getting altered because we were setting dsa.flags
instead.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
python/samba/kcc/kcc_utils.py

index 3b5b0cce55d70dc1380446753bcb3c97b600e263..1dfd6e962effaf5d74f9076f3f15f16943c44e52 100644 (file)
@@ -769,7 +769,8 @@ class DirectoryServiceAgent(object):
         '''Debug dump string output of connect table'''
         return '\n'.join(str(x) for x in self.connect_table)
 
-    def new_connection(self, options, flags, transport, from_dnstr, sched):
+    def new_connection(self, options, system_flags, transport, from_dnstr,
+                       sched):
         """Set up a new connection for the DSA based on input
         parameters.  Connection will be added to the DSA
         connect_table and will be marked as "to be added" pending
@@ -782,7 +783,7 @@ class DirectoryServiceAgent(object):
         connect.enabled = True
         connect.from_dnstr = from_dnstr
         connect.options = options
-        connect.flags = flags
+        connect.system_flags = system_flags
 
         if transport is not None:
             connect.transport_dnstr = transport.dnstr