diff --git a/install_utils/schema.ldiff b/install_utils/schema.ldiff index 8bcb4940..662f8850 100644 --- a/install_utils/schema.ldiff +++ b/install_utils/schema.ldiff @@ -22,7 +22,6 @@ cn: module{0} olcModulePath: /usr/lib/ldap olcModuleLoad: {0}back_hdb olcModuleLoad: {1}syncprov -olcModuleLoad: {2}accesslog structuralObjectClass: olcModuleList entryUUID: fc8f8478-514b-1034-9c34-0faf5bc7ead5 creatorsName: cn=admin,cn=config @@ -1068,7 +1067,7 @@ olcAccess: {0}to * by dn.exact=gidNumber=0+uidNumber=0,cn=peercred,cn=extern al,cn=auth manage by * break olcAccess: {1}to dn.exact="" by * read olcAccess: {2}to dn.base="cn=Subschema" by * read -olcSizeLimit: 500 +olcSizeLimit: 5000 structuralObjectClass: olcDatabaseConfig entryUUID: fc8f0016-514b-1034-9c2d-0faf5bc7ead5 creatorsName: cn=config @@ -1180,50 +1179,3 @@ entryCSN: 20160607103125.521039Z#000000#000#000000 modifiersName: cn=config modifyTimestamp: 20160607103125Z -dn: olcOverlay={1}accesslog,olcDatabase={1}hdb,cn=config -objectClass: olcOverlayConfig -objectClass: olcAccessLogConfig -olcOverlay: {1}accesslog -olcAccessLogDB: cn=accesslog -olcAccessLogOps: writes -olcAccessLogPurge: 07+00:00 01+00:00 -olcAccessLogSuccess: TRUE -structuralObjectClass: olcAccessLogConfig -entryUUID: 12c7b480-5724-1034-94b6-dd13061b01b4 -creatorsName: gidNumber=0+uidNumber=0,cn=peercred,cn=external,cn=auth -createTimestamp: 20150305013830Z -entryCSN: 20150305013830.947100Z#000000#000#000000 -modifiersName: gidNumber=0+uidNumber=0,cn=peercred,cn=external,cn=auth -modifyTimestamp: 20150305013830Z - -dn: olcDatabase={2}hdb,cn=config -objectClass: olcDatabaseConfig -objectClass: olcHdbConfig -olcDatabase: {2}hdb -olcDbDirectory: /var/lib/ldap/accesslog -olcSuffix: cn=accesslog -olcRootDN: cn=admin,dc=example,dc=com -olcDbIndex: default eq -olcDbIndex: entryCSN,objectClass,reqEnd,reqResult,reqStart -structuralObjectClass: olcHdbConfig -entryUUID: 12c135a6-5724-1034-94b2-dd13061b01b4 -creatorsName: gidNumber=0+uidNumber=0,cn=peercred,cn=external,cn=auth -createTimestamp: 20150305013830Z -entryCSN: 20150305013830.904530Z#000000#000#000000 -modifiersName: gidNumber=0+uidNumber=0,cn=peercred,cn=external,cn=auth -modifyTimestamp: 20150305013830Z - -dn: olcOverlay={0}syncprov,olcDatabase={2}hdb,cn=config -objectClass: olcOverlayConfig -objectClass: olcSyncProvConfig -olcOverlay: {0}syncprov -olcSpNoPresent: TRUE -olcSpReloadHint: TRUE -structuralObjectClass: olcSyncProvConfig -entryUUID: 12c79342-5724-1034-94b4-dd13061b01b4 -creatorsName: gidNumber=0+uidNumber=0,cn=peercred,cn=external,cn=auth -createTimestamp: 20150305013830Z -entryCSN: 20150305013830.946247Z#000000#000#000000 -modifiersName: gidNumber=0+uidNumber=0,cn=peercred,cn=external,cn=auth -modifyTimestamp: 20150305013830Z - diff --git a/re2o/login.py b/re2o/login.py index a5ae1324..fb78157d 100644 --- a/re2o/login.py +++ b/re2o/login.py @@ -26,7 +26,7 @@ def makeSecret(password): def hashNT(password): - hash = hashlib.new('md4', password.encode()).digest() + hash = hashlib.new('md4', password.encode('utf-16le')).digest() return binascii.hexlify(hash) diff --git a/users/models.py b/users/models.py index 9bf9c504..6e2f1092 100644 --- a/users/models.py +++ b/users/models.py @@ -258,7 +258,7 @@ class User(AbstractBaseUser): user_ldap.given_name = str(self.surname).lower() + '_' + str(self.name).lower()[:3] user_ldap.gid = LDAP['user_gid'] user_ldap.user_password = self.password[:6] + self.password[7:] - user_ldap.sambat_nt_password = self.pwd_ntlm + user_ldap.sambat_nt_password = self.pwd_ntlm.upper() if self.shell: user_ldap.login_shell = self.shell.shell if access_refresh: