diff --git a/main/forms.py b/main/forms.py index 391cc43..5173aec 100644 --- a/main/forms.py +++ b/main/forms.py @@ -21,6 +21,8 @@ class LDAPSetPasswordForm(SetPasswordForm): if commit: self.user.save() + # TODO: Log the result of the above. + return self.user def clean_new_password1(self): diff --git a/main/models.py b/main/models.py index 1c81789..6985da2 100644 --- a/main/models.py +++ b/main/models.py @@ -180,4 +180,3 @@ class Radusergroup(models.Model): class Meta: db_table = u'radusergroup' - diff --git a/main/utils.py b/main/utils.py index b55d276..f6aba23 100644 --- a/main/utils.py +++ b/main/utils.py @@ -4,9 +4,10 @@ from django.core.exceptions import ObjectDoesNotExist from models import Radcheck import passwd +import settings def set_kerberos_password(username, raw_password): - principal = u"{0}@NEUF.NO".format(username) + principal = u"{0}@{1}".format(username, settings.KERBEROS_REALM) kadmin_query = u"-q change_password {0} -pw {1}".format(principal, raw_password) p = Popen(['kadmin', kadmin_query], stdout=PIPE) output, error = p.communicate() diff --git a/settings-sample.py b/settings-sample.py index d380c47..7082720 100644 --- a/settings-sample.py +++ b/settings-sample.py @@ -162,3 +162,6 @@ import logging logger = logging.getLogger('django_auth_ldap') logger.addHandler(logging.StreamHandler()) logger.setLevel(logging.DEBUG) + +# Kerberos realm +KERBEROS_REALM = "NEUF.NO"