diff options
| author | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-10-14 22:26:44 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-03-01 06:29:03 +0100 |
| commit | c66780332bba2270ada4391fbb88728d06b94119 (patch) | |
| tree | a4702e399685ffbf939cc56e5793eb9208272bac /source4/dsdb | |
| parent | dbf6b481e9be61287d5c82d23b581ca4bfd09865 (diff) | |
| download | samba-c66780332bba2270ada4391fbb88728d06b94119.tar.gz samba-c66780332bba2270ada4391fbb88728d06b94119.tar.bz2 samba-c66780332bba2270ada4391fbb88728d06b94119.zip | |
s4:remove many invocations of "samdb_msg_add_string"
This call can be substituted by "ldb_msg_add_string". We only need to be
careful on local objects or talloc'ed ones which live shorter than the message.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/dsdb')
| -rw-r--r-- | source4/dsdb/common/util.c | 4 | ||||
| -rw-r--r-- | source4/dsdb/common/util_samr.c | 14 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/samldb.c | 4 |
3 files changed, 10 insertions, 12 deletions
diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c index 21318cba33..7527f355b7 100644 --- a/source4/dsdb/common/util.c +++ b/source4/dsdb/common/util.c @@ -2311,8 +2311,8 @@ NTSTATUS samdb_create_foreign_security_principal(struct ldb_context *sam_ctx, TA return NT_STATUS_NO_MEMORY; } - ret = samdb_msg_add_string(sam_ctx, msg, msg, - "objectClass", "foreignSecurityPrincipal"); + ret = ldb_msg_add_string(msg, "objectClass", + "foreignSecurityPrincipal"); if (ret != LDB_SUCCESS) { talloc_free(sidstr); return NT_STATUS_NO_MEMORY; diff --git a/source4/dsdb/common/util_samr.c b/source4/dsdb/common/util_samr.c index 02b412e433..deaea2e07f 100644 --- a/source4/dsdb/common/util_samr.c +++ b/source4/dsdb/common/util_samr.c @@ -140,10 +140,8 @@ NTSTATUS dsdb_add_user(struct ldb_context *ldb, return NT_STATUS_FOOBAR; } - samdb_msg_add_string(ldb, tmp_ctx, msg, "sAMAccountName", - account_name); - samdb_msg_add_string(ldb, tmp_ctx, msg, "objectClass", - obj_class); + ldb_msg_add_string(msg, "sAMAccountName", account_name); + ldb_msg_add_string(msg, "objectClass", obj_class); /* create the user */ ret = ldb_add(ldb, msg); @@ -289,8 +287,8 @@ NTSTATUS dsdb_add_domain_group(struct ldb_context *ldb, talloc_free(tmp_ctx); return NT_STATUS_NO_MEMORY; } - samdb_msg_add_string(ldb, tmp_ctx, msg, "sAMAccountName", groupname); - samdb_msg_add_string(ldb, tmp_ctx, msg, "objectClass", "group"); + ldb_msg_add_string(msg, "sAMAccountName", groupname); + ldb_msg_add_string(msg, "objectClass", "group"); /* create the group */ ret = ldb_add(ldb, msg); @@ -369,8 +367,8 @@ NTSTATUS dsdb_add_domain_alias(struct ldb_context *ldb, return NT_STATUS_NO_MEMORY; } - samdb_msg_add_string(ldb, mem_ctx, msg, "sAMAccountName", alias_name); - samdb_msg_add_string(ldb, mem_ctx, msg, "objectClass", "group"); + ldb_msg_add_string(msg, "sAMAccountName", alias_name); + ldb_msg_add_string(msg, "objectClass", "group"); samdb_msg_add_int(ldb, mem_ctx, msg, "groupType", GTYPE_SECURITY_DOMAIN_LOCAL_GROUP); /* create the alias */ diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c index d9b4a49918..f59aae8969 100644 --- a/source4/dsdb/samdb/ldb_modules/samldb.c +++ b/source4/dsdb/samdb/ldb_modules/samldb.c @@ -1268,8 +1268,8 @@ static int samldb_user_account_control_change(struct samldb_ctx *ac) if (user_account_control & (UF_SERVER_TRUST_ACCOUNT | UF_PARTIAL_SECRETS_ACCOUNT)) { - ret = samdb_msg_add_string(ldb, ac->msg, ac->msg, - "isCriticalSystemObject", "TRUE"); + ret = ldb_msg_add_string(ac->msg, "isCriticalSystemObject", + "TRUE"); if (ret != LDB_SUCCESS) { return ret; } |