svn commit: samba r17513 - in branches/SAMBA_4_0/source/dsdb/samdb:
.
idra at samba.org
idra at samba.org
Sun Aug 13 07:32:06 GMT 2006
Author: idra
Date: 2006-08-13 07:32:05 +0000 (Sun, 13 Aug 2006)
New Revision: 17513
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17513
Log:
ldb_set_errstring is an ldb private string, samdb uses DEBUG() statements
Modified:
branches/SAMBA_4_0/source/dsdb/samdb/samdb.c
Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/samdb.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/samdb.c 2006-08-13 00:22:52 UTC (rev 17512)
+++ branches/SAMBA_4_0/source/dsdb/samdb/samdb.c 2006-08-13 07:32:05 UTC (rev 17513)
@@ -27,7 +27,6 @@
#include "librpc/gen_ndr/ndr_misc.h"
#include "librpc/gen_ndr/ndr_security.h"
#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_private.h"
#include "lib/ldb/include/ldb_errors.h"
#include "libcli/security/security.h"
#include "auth/credentials/credentials.h"
@@ -690,7 +689,7 @@
return ret;
}
if (res->count != 1) {
- ldb_set_errstring(ldb, talloc_asprintf(ldb, "samdb_copy_template: ERROR: template '%s' matched %d records, expected 1\n", filter,
+ DEBUG(1, ("samdb_copy_template: ERROR: template '%s' matched %d records, expected 1\n", filter,
res->count));
talloc_free(res);
return LDB_ERR_OPERATIONS_ERROR;
@@ -720,7 +719,7 @@
ret = samdb_find_or_add_value(ldb, msg, el->name,
(char *)el->values[j].data);
if (ret) {
- ldb_set_errstring(ldb, talloc_asprintf(ldb, "Adding objectClass %s failed.\n", el->values[j].data));
+ DEBUG(1, ( "Adding objectClass %s failed.\n", el->values[j].data));
talloc_free(res);
return ret;
}
@@ -728,7 +727,7 @@
ret = samdb_find_or_add_attribute(ldb, msg, el->name,
(char *)el->values[j].data);
if (ret) {
- ldb_set_errstring(ldb, talloc_asprintf(ldb, "Adding attribute %s failed.\n", el->name));
+ DEBUG(1, ("Adding attribute %s failed.\n", el->name));
talloc_free(res);
return ret;
}
More information about the samba-cvs
mailing list