Fix OR query in smb4.conf

truenas · Jul 26, 2016 · 20d4da3 · 20d4da3
1 parent 521f649
commit 20d4da3
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/freenas/usr/local/libexec/nas/generate_smb4_conf.py b/src/freenas/usr/local/libexec/nas/generate_smb4_conf.py
@@ -761,13 +761,12 @@ def add_domaincontroller_conf(client, smb4_conf):
 
 
 def get_smb4_users(client):
-    # FIXME: test query and support for OR
-    return client.call('datastore.query', 'account.bsdusers', (
-        'OR', [
+    return client.call('datastore.query', 'account.bsdusers', [
+        ['OR', [
             ('bsdusr_smbhash', '~', r'^.+:.+:[X]{32}:.+$'),
             ('bsdusr_smbhash', '~', r'^.+:.+:[A-F0-9]{32}:.+$'),
-        ],
-    ))
+        ]],
+    ])
 
 
 def get_disabled_users(client):