sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-04 17:47:26 +03:00
Code

samba-tool: add --smartcard-required option to 'samba-tool user create'

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11441

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Stefan Metzmacher 2016-06-02 14:19:37 +02:00 committed by Andrew Bartlett
parent 9a8186167e
commit 7ffffc93f9
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
python/samba/netcmd/user.py
View File

@ -90,6 +90,9 @@ Example5 shows how to create an RFC2307/NIS domain enabled user account. If
Option("--random-password", Option("--random-password",
help="Generate random password", help="Generate random password",
action="store_true"), action="store_true"),
Option("--smartcard-required",
help="Require a smartcard for interactive logons",
action="store_true"),
Option("--use-username-as-cn", Option("--use-username-as-cn",
help="Force use of username as user's CN", help="Force use of username as user's CN",
action="store_true"), action="store_true"),
@ -141,12 +144,25 @@ Example5 shows how to create an RFC2307/NIS domain enabled user account. If
mail_address=None, internet_address=None, telephone_number=None, mail_address=None, internet_address=None, telephone_number=None,
physical_delivery_office=None, rfc2307_from_nss=False, physical_delivery_office=None, rfc2307_from_nss=False,
nis_domain=None, unix_home=None, uid=None, uid_number=None, nis_domain=None, unix_home=None, uid=None, uid_number=None,
gid_number=None, gecos=None, login_shell=None): gid_number=None, gecos=None, login_shell=None,
smartcard_required=False):
if random_password: if smartcard_required:
if password is not None and password is not '':
raise CommandError('It is not allowed to specifiy '
'--newpassword '
'together with --smartcard-required.')
if must_change_at_next_login:
raise CommandError('It is not allowed to specifiy '
'--must-change-at-next-login '
'together with --smartcard-required.')
if random_password and not smartcard_required:
password = generate_random_password(128, 255) password = generate_random_password(128, 255)
while True: while True:
if smartcard_required:
break
if password is not None and password is not '': if password is not None and password is not '':
break break
password = getpass("New Password: ") password = getpass("New Password: ")
@ -194,7 +210,8 @@ Example5 shows how to create an RFC2307/NIS domain enabled user account. If
telephonenumber=telephone_number, physicaldeliveryoffice=physical_delivery_office, telephonenumber=telephone_number, physicaldeliveryoffice=physical_delivery_office,
nisdomain=nis_domain, unixhome=unix_home, uid=uid, nisdomain=nis_domain, unixhome=unix_home, uid=uid,
uidnumber=uid_number, gidnumber=gid_number, uidnumber=uid_number, gidnumber=gid_number,
gecos=gecos, loginshell=login_shell) gecos=gecos, loginshell=login_shell,
smartcard_required=smartcard_required)
except Exception, e: except Exception, e:
raise CommandError("Failed to add user '%s': " % username, e) raise CommandError("Failed to add user '%s': " % username, e)