sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

samba-tool group listmembers: always list objects which can not expire

Browse Source 
Otherwise for example contacts wouldn't be listed when the
--hide-expired option is used. Contacts typically do not have the
accountExpires attribute.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14692

Signed-off-by: Björn Baumbach <bb@sernet.de>
Reviewed-by: Rowland penny <rpenny@samba.org>

Autobuild-User(master): Björn Baumbach <bb@sernet.de>
Autobuild-Date(master): Mon Apr 26 13:21:43 UTC 2021 on sn-devel-184
This commit is contained in:
Björn Baumbach 2021-04-23 18:03:53 +02:00
parent 86f2b8dab1
commit 2e2426e515
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
python/samba/netcmd/group.py
View File

@ -544,8 +544,11 @@ samba-tool group listmembers \"Domain Users\" -H ldap://samba.samdom.example.com
filter_expires = ""
if hide_expired is True:
current_nttime = samdb.get_nttime()
filter_expires = \
"(|(accountExpires=0)(accountExpires>=%u))" % (current_nttime)
filter_expires = ("(|"
"(!(accountExpires=*))"
"(accountExpires=0)"
"(accountExpires>=%u)"
")" % (current_nttime))
filter_disabled = ""
if hide_disabled is True:

1
selftest/knownfail.d/samba4.blackbox.group
View File

@ -1 +0,0 @@
^samba4.blackbox.group.py