diff options
| author | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-06-13 18:19:37 +0200 |
|---|---|---|
| committer | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-06-13 18:35:19 +0200 |
| commit | 4b6ce8efc0f4b914bcd43ba6a05ce383e51d49fd (patch) | |
| tree | 9b6109cab37f3b1a9af9a4b823c3713e7fc4aaa4 | |
| parent | 7b7213f1eedfbb68217fa760edaa3392dab5f507 (diff) | |
| download | samba-4b6ce8efc0f4b914bcd43ba6a05ce383e51d49fd.tar.gz samba-4b6ce8efc0f4b914bcd43ba6a05ce383e51d49fd.tar.bz2 samba-4b6ce8efc0f4b914bcd43ba6a05ce383e51d49fd.zip | |
s4:fix allocated control OIDs for "password_hash" LDB module
The password hash module controls overlapped others. Sorry, but the
"schema_samba4.ldif" hasn't been kept up-to-date.
| -rw-r--r-- | source4/dsdb/samdb/samdb.h | 6 | ||||
| -rw-r--r-- | source4/setup/schema_samba4.ldif | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/source4/dsdb/samdb/samdb.h b/source4/dsdb/samdb/samdb.h index bf63188de9..ee42269000 100644 --- a/source4/dsdb/samdb/samdb.h +++ b/source4/dsdb/samdb/samdb.h @@ -61,7 +61,7 @@ struct dsdb_control_current_partition { * much like LDB_CONTROL_EXTENDED_DN_OID when the DB stores an * extended DN, and otherwise returns normal DNs */ -#define DSDB_CONTROL_PASSWORD_CHANGE_STATUS_OID "1.3.6.1.4.1.7165.4.3.6" +#define DSDB_CONTROL_PASSWORD_CHANGE_STATUS_OID "1.3.6.1.4.1.7165.4.3.8" struct dsdb_control_password_change_status { struct { @@ -78,9 +78,9 @@ struct dsdb_control_password_change_status { enum samPwdChangeReason reject_reason; }; -#define DSDB_CONTROL_PASSWORD_HASH_VALUES_OID "1.3.6.1.4.1.7165.4.3.7" +#define DSDB_CONTROL_PASSWORD_HASH_VALUES_OID "1.3.6.1.4.1.7165.4.3.9" -#define DSDB_CONTROL_PASSWORD_CHANGE_OLD_PW_CHECKED_OID "1.3.6.1.4.1.7165.4.3.8" +#define DSDB_CONTROL_PASSWORD_CHANGE_OLD_PW_CHECKED_OID "1.3.6.1.4.1.7165.4.3.10" #define DSDB_EXTENDED_REPLICATED_OBJECTS_OID "1.3.6.1.4.1.7165.4.4.1" struct dsdb_extended_replicated_object { diff --git a/source4/setup/schema_samba4.ldif b/source4/setup/schema_samba4.ldif index fc9bfcadcc..2e61911b62 100644 --- a/source4/setup/schema_samba4.ldif +++ b/source4/setup/schema_samba4.ldif @@ -178,9 +178,11 @@ #Allocated: DSDB_CONTROL_REPLICATED_UPDATE_OID 1.3.6.1.4.1.7165.4.3.3 #Allocated: DSDB_CONTROL_DN_STORAGE_FORMAT_OID 1.3.6.1.4.1.7165.4.3.4 #Allocated: LDB_CONTROL_RECALCULATE_SD_OID 1.3.6.1.4.1.7165.4.3.5 -#Allocated: DSDB_CONTROL_PASSWORD_CHANGE_STATUS_OID 1.3.6.1.4.1.7165.4.3.6 -#Allocated: DSDB_CONTROL_PASSWORD_HASH_VALUES_OID 1.3.6.1.4.1.7165.4.3.7 -#Allocated: DSDB_CONTROL_PASSWORD_CHANGE_OLD_PW_CHECKED_OID 1.3.6.1.4.1.7165.4.3.8 +#Allocated: LDB_CONTROL_REVEAL_INTERNALS 1.3.6.1.4.1.7165.4.3.6 +#Allocated: LDB_CONTROL_AS_SYSTEM_OID 1.3.6.1.4.1.7165.4.3.7 +#Allocated: DSDB_CONTROL_PASSWORD_CHANGE_STATUS_OID 1.3.6.1.4.1.7165.4.3.8 +#Allocated: DSDB_CONTROL_PASSWORD_HASH_VALUES_OID 1.3.6.1.4.1.7165.4.3.9 +#Allocated: DSDB_CONTROL_PASSWORD_CHANGE_OLD_PW_CHECKED_OID 1.3.6.1.4.1.7165.4.3.10 # Extended 1.3.6.1.4.1.7165.4.4.x #Allocated: DSDB_EXTENDED_REPLICATED_OBJECTS_OID 1.3.6.1.4.1.7165.4.4.1 |