Merge branch 'master' into python3

This commit is contained in:
Nikolai R Kristiansen committed 2017-01-12 00:10:26 +01:00
commit 1cd164627c
1 file changed
+8 -6
+8 -6
View File
@@ -37,12 +37,14 @@ def has_kerberos_principal(username):
def set_kerberos_password(username, raw_password):
principal = "{}@{}".format(username, settings.KERBEROS_REALM)
kadmin_query = " -p {} -w {} -q 'change_password -pw {} {}'".format(
settings.KERBEROS_ADMIN_PRINCIPAL,
settings.KERBEROS_PASSWORD,
raw_password,
principal)
p = Popen('kadmin' + kadmin_query, shell=True, stdout=PIPE, stderr=PIPE)
kadmin_query = 'change_password -pw {} {}'.format(raw_password, principal)
kadmin_params = [
'-p', settings.KERBEROS_ADMIN_PRINCIPAL,
'-w', settings.KERBEROS_PASSWORD,
'-q', kadmin_query]
cmd = ['kadmin'] + kadmin_params
p = Popen(cmd, stdout=PIPE, stderr=PIPE)
output, error = p.communicate()
if error:
# Can not init with KDC?