ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Merge pull request #335 from sfromm/user

Browse source 
User module fix
This commit is contained in:
Michael DeHaan 2012-05-08 11:10:37 -07:00
commit adfe6b8589
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
library/user
View file

@ -25,9 +25,13 @@ import os
import pwd import pwd
import grp import grp
import shlex import shlex
import spwd
import subprocess import subprocess
import sys import sys
try:
import spwd
HAVE_SPWD=True
except:
HAVE_SPWD=False
USERADD = "/usr/sbin/useradd" USERADD = "/usr/sbin/useradd"
USERMOD = "/usr/sbin/usermod" USERMOD = "/usr/sbin/usermod"
@ -119,6 +123,10 @@ def user_add(user, **kwargs):
else: else:
return False return False
"""
Without spwd, we would have to resort to reading /etc/shadow
to get the encrypted string. For now, punt on idempotent password changes.
"""
def user_mod(user, **kwargs): def user_mod(user, **kwargs):
cmd = [USERMOD] cmd = [USERMOD]
info = user_info(user) info = user_info(user)
@ -227,9 +235,11 @@ def user_info(user):
return False return False
try: try:
info = get_pwd_info(user) info = get_pwd_info(user)
if HAVE_SPWD:
sinfo = spwd.getspnam(user) sinfo = spwd.getspnam(user)
except KeyError: except KeyError:
return False return False
if HAVE_SPWD:
info[1] = sinfo[1] info[1] = sinfo[1]
return info return info