diff options
| author | Stefan Metzmacher <metze@samba.org> | 2010-06-30 08:24:35 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2010-07-05 18:00:14 +0200 |
| commit | 6d7b9648e5bff20136dd4462313ce4c3cd502662 (patch) | |
| tree | ee3532bb1a20acd5d25c6d7f6df44906bff7cae2 | |
| parent | 24d6950f631f7b1f36ee72c1d06b6b4bc9a1033a (diff) | |
| download | samba-6d7b9648e5bff20136dd4462313ce4c3cd502662.tar.gz samba-6d7b9648e5bff20136dd4462313ce4c3cd502662.tar.xz samba-6d7b9648e5bff20136dd4462313ce4c3cd502662.zip | |
s4:dsdb: allocate DSDB_CONTROL_BYPASS_PASSWORD_HASH_OID
When importing users from Samba3 we need to control all values.
metze
| -rw-r--r-- | source4/dsdb/samdb/samdb.h | 5 | ||||
| -rw-r--r-- | source4/setup/schema_samba4.ldif | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/source4/dsdb/samdb/samdb.h b/source4/dsdb/samdb/samdb.h index 88c61132eeb..8b45cd01805 100644 --- a/source4/dsdb/samdb/samdb.h +++ b/source4/dsdb/samdb/samdb.h @@ -87,6 +87,11 @@ struct dsdb_control_password_change_status { */ #define DSDB_CONTROL_APPLY_LINKS "1.3.6.1.4.1.7165.4.3.11" +/* + * this should only be used for importing users from Samba3 + */ +#define DSDB_CONTROL_BYPASS_PASSWORD_HASH_OID "1.3.6.1.4.1.7165.4.3.12" + #define DSDB_EXTENDED_REPLICATED_OBJECTS_OID "1.3.6.1.4.1.7165.4.4.1" struct dsdb_extended_replicated_object { struct ldb_message *msg; diff --git a/source4/setup/schema_samba4.ldif b/source4/setup/schema_samba4.ldif index b8ef5d6f51a..681aa968984 100644 --- a/source4/setup/schema_samba4.ldif +++ b/source4/setup/schema_samba4.ldif @@ -184,6 +184,7 @@ #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 #Allocated: DSDB_CONTROL_APPLY_LINKS 1.3.6.1.4.1.7165.4.3.11 +#Allocated: DSDB_CONTROL_BYPASS_PASSWORD_HASH_OID 1.3.6.1.4.1.7165.4.3.12 #Allocated: LDB_CONTROL_BYPASSOPERATIONAL_OID 1.3.6.1.4.1.7165.4.3.13 # Extended 1.3.6.1.4.1.7165.4.4.x |