sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-29 11:21:54 +03:00
Code

r24919: Merge build fix and improved error strings to release branch.

Browse Source 
Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2007-09-03 07:58:18 +02:00 committed by Stefan Metzmacher
parent 69c3193610
commit f189553db7
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/dsdb/samdb/samdb.c
View File

@ -691,6 +691,8 @@ int samdb_copy_template(struct ldb_context *ldb,
*errstring = NULL;
if (!ldb_dn_add_child_fmt(basedn, "CN=Template%s", name)) {
*errstring = talloc_asprintf(msg, "samdb_copy_template: ERROR: Failed to contruct DN for template '%s'",
name);
return LDB_ERR_OPERATIONS_ERROR;
}
@ -702,7 +704,7 @@ int samdb_copy_template(struct ldb_context *ldb,
return ret;
}
if (res->count != 1) {
*errstring = talloc_asprintf(msg, "samdb_copy_template: ERROR: template '%s' matched %d records, expected 1\n",
*errstring = talloc_asprintf(msg, "samdb_copy_template: ERROR: template '%s' matched %d records, expected 1",
name,
res->count);
talloc_free(res);
@ -726,7 +728,7 @@ int samdb_copy_template(struct ldb_context *ldb,
ret = samdb_find_or_add_attribute(ldb, msg, el->name,
(char *)el->values[j].data);
if (ret) {
*errstring = talloc_asprintf(msg, "Adding attribute %s failed.\n", el->name);
*errstring = talloc_asprintf(msg, "Adding attribute %s failed.", el->name);
talloc_free(res);
return ret;
}

2
source/rpc_server/lsa/dcesrv_lsa.c
View File

@ -2284,7 +2284,7 @@ static NTSTATUS dcesrv_lsa_CreateSecret(struct dcesrv_call_state *dce_call, TALL
/* pull in all the template attributes. Note this is always from the global samdb */
ret = samdb_copy_template(secret_state->policy->sam_ldb, msg,
"(&(cn=TemplateSecret)(objectclass=secretTemplate))", &errstr);
"secret", &errstr);
if (ret != 0) {
DEBUG(0,("Failed to load TemplateSecret from samdb: %s\n",
errstr));