From 30ad9a95476ae78d05592a1597bb64d7b769f8a1 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 17 Jan 2018 23:03:00 +0100 Subject: [PATCH] Nscd version fixed at deb repo level, so this isn't needed anymore --- src/yunohost/tools.py | 4 ++-- src/yunohost/user.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/yunohost/tools.py b/src/yunohost/tools.py index 1ac123a9d..99ae5e636 100644 --- a/src/yunohost/tools.py +++ b/src/yunohost/tools.py @@ -104,7 +104,7 @@ def tools_ldapinit(): auth.update('cn=admin', admin_dict) # Force nscd to refresh cache to take admin creation into account - subprocess.call(['nscd', '-i', 'passwd'], stderr=open(os.devnull, 'wb')) + subprocess.call(['nscd', '-i', 'passwd']) # Check admin actually exists now try: @@ -203,7 +203,7 @@ def _set_hostname(hostname, pretty_hostname=None): pretty_hostname = "(YunoHost/%s)" % hostname # First clear nsswitch cache for hosts to make sure hostname is resolved... - subprocess.call(['nscd', '-i', 'hosts'], stderr=open(os.devnull, 'wb')) + subprocess.call(['nscd', '-i', 'hosts']) # Then call hostnamectl commands = [ diff --git a/src/yunohost/user.py b/src/yunohost/user.py index 740258256..bed5fb8c8 100644 --- a/src/yunohost/user.py +++ b/src/yunohost/user.py @@ -194,7 +194,7 @@ def user_create(auth, username, firstname, lastname, mail, password, if auth.add('uid=%s,ou=users' % username, attr_dict): # Invalidate passwd to take user creation into account - subprocess.call(['nscd', '-i', 'passwd'], stderr=open(os.devnull, 'wb')) + subprocess.call(['nscd', '-i', 'passwd']) # Update SFTP user group memberlist = auth.search(filter='cn=sftpusers', attrs=['memberUid'])[0]['memberUid'] @@ -233,7 +233,7 @@ def user_delete(auth, username, purge=False): if auth.remove('uid=%s,ou=users' % username): # Invalidate passwd to take user deletion into account - subprocess.call(['nscd', '-i', 'passwd'], stderr=open(os.devnull, 'wb')) + subprocess.call(['nscd', '-i', 'passwd']) # Update SFTP user group memberlist = auth.search(filter='cn=sftpusers', attrs=['memberUid'])[0]['memberUid']