diff options
| author | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-11-10 16:05:16 +0100 |
|---|---|---|
| committer | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-11-11 10:03:40 +0100 |
| commit | feb00fe7cc238a78b3832c116cb4634936597735 (patch) | |
| tree | fc4a62bfa07e55d15a7e18f9de960e31b47ed9a4 /source4/lib | |
| parent | 4fe63d927e5e684d3e2bec9642a1e77b056ab2ed (diff) | |
| download | samba-feb00fe7cc238a78b3832c116cb4634936597735.tar.gz samba-feb00fe7cc238a78b3832c116cb4634936597735.tar.bz2 samba-feb00fe7cc238a78b3832c116cb4634936597735.zip | |
s4:dsdb - proof against empty RDN values where expected
This should prevent crashes as pointed out on the mailing list.
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/ldb/modules/rdn_name.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/source4/lib/ldb/modules/rdn_name.c b/source4/lib/ldb/modules/rdn_name.c index 623471a397..38d87b0712 100644 --- a/source4/lib/ldb/modules/rdn_name.c +++ b/source4/lib/ldb/modules/rdn_name.c @@ -87,6 +87,7 @@ static int rdn_name_add(struct ldb_module *module, struct ldb_request *req) struct ldb_message_element *attribute; const struct ldb_schema_attribute *a; const char *rdn_name; + const struct ldb_val *rdn_val_p; struct ldb_val rdn_val; unsigned int i; int ret; @@ -116,7 +117,11 @@ static int rdn_name_add(struct ldb_module *module, struct ldb_request *req) return LDB_ERR_OPERATIONS_ERROR; } - rdn_val = ldb_val_dup(msg, ldb_dn_get_rdn_val(msg->dn)); + rdn_val_p = ldb_dn_get_rdn_val(msg->dn); + if (rdn_val_p == NULL) { + return LDB_ERR_OPERATIONS_ERROR; + } + rdn_val = ldb_val_dup(msg, rdn_val_p); /* Perhaps someone above us tried to set this? Then ignore it */ ldb_msg_remove_attr(msg, "name"); @@ -233,6 +238,7 @@ static int rdn_rename_callback(struct ldb_request *req, struct ldb_reply *ares) struct rename_context *ac; struct ldb_request *mod_req; const char *rdn_name; + const struct ldb_val *rdn_val_p; struct ldb_val rdn_val; struct ldb_message *msg; int ret; @@ -273,8 +279,11 @@ static int rdn_rename_callback(struct ldb_request *req, struct ldb_reply *ares) if (rdn_name == NULL) { goto error; } - - rdn_val = ldb_val_dup(msg, ldb_dn_get_rdn_val(ac->req->op.rename.newdn)); + rdn_val_p = ldb_dn_get_rdn_val(msg->dn); + if (rdn_val_p == NULL) { + return LDB_ERR_OPERATIONS_ERROR; + } + rdn_val = ldb_val_dup(msg, rdn_val_p); if (ldb_msg_add_empty(msg, rdn_name, LDB_FLAG_MOD_REPLACE, NULL) != 0) { goto error; |