diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-12-09 15:18:37 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-12-09 18:18:26 +1100 |
| commit | 0fca76e5775e46dd69153eee93e92b1937df29b5 (patch) | |
| tree | f0e864a26d38b2fdedb69f52a568c642abed9b1b /source4/dsdb/samdb/ldb_modules/password_hash.c | |
| parent | 732c701c52932419e602adfe726dee89d89549d3 (diff) | |
| download | samba-0fca76e5775e46dd69153eee93e92b1937df29b5.tar.gz samba-0fca76e5775e46dd69153eee93e92b1937df29b5.tar.bz2 samba-0fca76e5775e46dd69153eee93e92b1937df29b5.zip | |
s4-dsdb: added dsdb_functional_level() helper function
Diffstat (limited to 'source4/dsdb/samdb/ldb_modules/password_hash.c')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/password_hash.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c index 8791db2bc4..4d4f500e87 100644 --- a/source4/dsdb/samdb/ldb_modules/password_hash.c +++ b/source4/dsdb/samdb/ldb_modules/password_hash.c @@ -1025,7 +1025,6 @@ static int setup_supplemental_field(struct setup_password_fields_io *io) uint8_t zero16[16]; bool do_newer_keys = false; bool do_cleartext = false; - int *domainFunctionality; ZERO_STRUCT(zero16); ZERO_STRUCT(names); @@ -1065,10 +1064,7 @@ static int setup_supplemental_field(struct setup_password_fields_io *io) } } /* Per MS-SAMR 3.1.1.8.11.6 we create AES keys if our domain functionality level is 2008 or higher */ - domainFunctionality = talloc_get_type(ldb_get_opaque(ldb, "domainFunctionality"), int); - - do_newer_keys = *domainFunctionality && - (*domainFunctionality >= DS_DOMAIN_FUNCTION_2008); + do_newer_keys = (dsdb_functional_level(ldb) >= DS_DOMAIN_FUNCTION_2008); if (io->domain->store_cleartext && (io->u.user_account_control & UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED)) { |