r24918: Fix the build (forgot to include dcesrv_lsa.c in the previous commit)
authorAndrew Bartlett <abartlet@samba.org>
Mon, 3 Sep 2007 07:56:29 +0000 (07:56 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 20:03:38 +0000 (15:03 -0500)
and improve error strings returned from samdb.c

Andrew Bartlett
(This used to be commit a42d0eb531e663304bea840d614b2f91f95dd818)

source4/dsdb/samdb/samdb.c
source4/rpc_server/lsa/dcesrv_lsa.c

index 18669a2ae7db566c2238d826e0b340aea160dec9..17c40dd30d09bb5608b0a6aab8d240908f8535c2 100644 (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;
                        }
index 72f12564ed338bdd19307515b4a852537991b7ba..531cfc49e57563aa05f989b75e9d23b7571837ac 100644 (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));