summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-08-06 03:48:56 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:01:30 -0500
commit85e197502221049085e2ed882a1011229a623811 (patch)
tree2cf992e3dc2db13341509bca5f7d8bb2ed915d16
parent58d9f6ed9dc054f4046be660353f1fb627145911 (diff)
downloadsamba-85e197502221049085e2ed882a1011229a623811.tar.gz
samba-85e197502221049085e2ed882a1011229a623811.tar.bz2
samba-85e197502221049085e2ed882a1011229a623811.zip
r24247: Remove extra newlines from ldb_debug() calls - it already adds one.
Andrew Bartlett (This used to be commit e5fdcda2a1e97c587d48baf3521b18515277f6de)
-rw-r--r--source4/dsdb/samdb/ldb_modules/naming_fsmo.c12
-rw-r--r--source4/dsdb/samdb/ldb_modules/pdc_fsmo.c10
-rw-r--r--source4/dsdb/samdb/ldb_modules/schema_fsmo.c24
3 files changed, 23 insertions, 23 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/naming_fsmo.c b/source4/dsdb/samdb/ldb_modules/naming_fsmo.c
index d87f4c90cc..ddd357a4c6 100644
--- a/source4/dsdb/samdb/ldb_modules/naming_fsmo.c
+++ b/source4/dsdb/samdb/ldb_modules/naming_fsmo.c
@@ -52,7 +52,7 @@ static int naming_fsmo_init(struct ldb_module *module)
naming_dn = samdb_partitions_dn(module->ldb, mem_ctx);
if (!naming_dn) {
ldb_debug(module->ldb, LDB_DEBUG_WARNING,
- "naming_fsmo_init: no partitions dn present: (skip loading of naming contexts details)\n");
+ "naming_fsmo_init: no partitions dn present: (skip loading of naming contexts details)");
talloc_free(mem_ctx);
return ldb_next_init(module);
}
@@ -70,13 +70,13 @@ static int naming_fsmo_init(struct ldb_module *module)
&naming_res);
if (ret == LDB_ERR_NO_SUCH_OBJECT) {
ldb_debug(module->ldb, LDB_DEBUG_WARNING,
- "naming_fsmo_init: no partitions dn present: (skip loading of naming contexts details)\n");
+ "naming_fsmo_init: no partitions dn present: (skip loading of naming contexts details)");
talloc_free(mem_ctx);
return ldb_next_init(module);
}
if (ret != LDB_SUCCESS) {
ldb_debug_set(module->ldb, LDB_DEBUG_FATAL,
- "naming_fsmo_init: failed to search the cross-ref container: %s: %s\n",
+ "naming_fsmo_init: failed to search the cross-ref container: %s: %s",
ldb_strerror(ret), ldb_errstring(module->ldb));
talloc_free(mem_ctx);
return ret;
@@ -84,12 +84,12 @@ static int naming_fsmo_init(struct ldb_module *module)
talloc_steal(mem_ctx, naming_res);
if (naming_res->count == 0) {
ldb_debug(module->ldb, LDB_DEBUG_WARNING,
- "naming_fsmo_init: no cross-ref container present: (skip loading of naming contexts details)\n");
+ "naming_fsmo_init: no cross-ref container present: (skip loading of naming contexts details)");
talloc_free(mem_ctx);
return ldb_next_init(module);
} else if (naming_res->count > 1) {
ldb_debug_set(module->ldb, LDB_DEBUG_FATAL,
- "naming_fsmo_init: [%u] cross-ref containers found on a base search\n",
+ "naming_fsmo_init: [%u] cross-ref containers found on a base search",
naming_res->count);
talloc_free(mem_ctx);
return LDB_ERR_CONSTRAINT_VIOLATION;
@@ -110,7 +110,7 @@ static int naming_fsmo_init(struct ldb_module *module)
talloc_steal(module, naming_fsmo);
ldb_debug(module->ldb, LDB_DEBUG_TRACE,
- "naming_fsmo_init: we are master: %s\n",
+ "naming_fsmo_init: we are master: %s",
(naming_fsmo->we_are_master?"yes":"no"));
talloc_free(mem_ctx);
diff --git a/source4/dsdb/samdb/ldb_modules/pdc_fsmo.c b/source4/dsdb/samdb/ldb_modules/pdc_fsmo.c
index 6a5a3bbc02..d78ba14ab4 100644
--- a/source4/dsdb/samdb/ldb_modules/pdc_fsmo.c
+++ b/source4/dsdb/samdb/ldb_modules/pdc_fsmo.c
@@ -51,7 +51,7 @@ static int pdc_fsmo_init(struct ldb_module *module)
pdc_dn = samdb_base_dn(module->ldb);
if (!pdc_dn) {
ldb_debug(module->ldb, LDB_DEBUG_WARNING,
- "pdc_fsmo_init: no domain dn present: (skip loading of domain details)\n");
+ "pdc_fsmo_init: no domain dn present: (skip loading of domain details)");
talloc_free(mem_ctx);
return ldb_next_init(module);
}
@@ -69,7 +69,7 @@ static int pdc_fsmo_init(struct ldb_module *module)
&pdc_res);
if (ret != LDB_SUCCESS) {
ldb_debug_set(module->ldb, LDB_DEBUG_FATAL,
- "pdc_fsmo_init: failed to search the domain object: %d:%s\n",
+ "pdc_fsmo_init: failed to search the domain object: %d:%s",
ret, ldb_strerror(ret));
talloc_free(mem_ctx);
return ret;
@@ -77,12 +77,12 @@ static int pdc_fsmo_init(struct ldb_module *module)
talloc_steal(mem_ctx, pdc_res);
if (pdc_res->count == 0) {
ldb_debug(module->ldb, LDB_DEBUG_WARNING,
- "pdc_fsmo_init: no domain object present: (skip loading of domain details)\n");
+ "pdc_fsmo_init: no domain object present: (skip loading of domain details)");
talloc_free(mem_ctx);
return ldb_next_init(module);
} else if (pdc_res->count > 1) {
ldb_debug_set(module->ldb, LDB_DEBUG_FATAL,
- "pdc_fsmo_init: [%u] domain objects found on a base search\n",
+ "pdc_fsmo_init: [%u] domain objects found on a base search",
pdc_res->count);
talloc_free(mem_ctx);
return LDB_ERR_CONSTRAINT_VIOLATION;
@@ -103,7 +103,7 @@ static int pdc_fsmo_init(struct ldb_module *module)
talloc_steal(module, pdc_fsmo);
ldb_debug(module->ldb, LDB_DEBUG_TRACE,
- "pdc_fsmo_init: we are master: %s\n",
+ "pdc_fsmo_init: we are master: %s",
(pdc_fsmo->we_are_master?"yes":"no"));
talloc_free(mem_ctx);
diff --git a/source4/dsdb/samdb/ldb_modules/schema_fsmo.c b/source4/dsdb/samdb/ldb_modules/schema_fsmo.c
index 51ef6c341f..a92f2646c4 100644
--- a/source4/dsdb/samdb/ldb_modules/schema_fsmo.c
+++ b/source4/dsdb/samdb/ldb_modules/schema_fsmo.c
@@ -60,7 +60,7 @@ static int schema_fsmo_init(struct ldb_module *module)
schema_dn = samdb_schema_dn(module->ldb);
if (!schema_dn) {
ldb_debug(module->ldb, LDB_DEBUG_WARNING,
- "schema_fsmo_init: no schema dn present: (skip schema loading)\n");
+ "schema_fsmo_init: no schema dn present: (skip schema loading)");
return ldb_next_init(module);
}
@@ -92,7 +92,7 @@ static int schema_fsmo_init(struct ldb_module *module)
&schema_res);
if (ret != LDB_SUCCESS) {
ldb_debug_set(module->ldb, LDB_DEBUG_FATAL,
- "schema_fsmo_init: failed to search the schema head: %d:%s\n",
+ "schema_fsmo_init: failed to search the schema head: %d:%s",
ret, ldb_strerror(ret));
talloc_free(mem_ctx);
return ret;
@@ -100,12 +100,12 @@ static int schema_fsmo_init(struct ldb_module *module)
talloc_steal(mem_ctx, schema_res);
if (schema_res->count == 0) {
ldb_debug(module->ldb, LDB_DEBUG_WARNING,
- "schema_fsmo_init: no schema head present: (skip schema loading)\n");
+ "schema_fsmo_init: no schema head present: (skip schema loading)");
talloc_free(mem_ctx);
return ldb_next_init(module);
} else if (schema_res->count > 1) {
ldb_debug_set(module->ldb, LDB_DEBUG_FATAL,
- "schema_fsmo_init: [%u] schema heads found on a base search\n",
+ "schema_fsmo_init: [%u] schema heads found on a base search",
schema_res->count);
talloc_free(mem_ctx);
return LDB_ERR_CONSTRAINT_VIOLATION;
@@ -114,7 +114,7 @@ static int schema_fsmo_init(struct ldb_module *module)
prefix_val = ldb_msg_find_ldb_val(schema_res->msgs[0], "prefixMap");
if (!prefix_val) {
ldb_debug_set(module->ldb, LDB_DEBUG_FATAL,
- "schema_fsmo_init: no prefixMap attribute found\n");
+ "schema_fsmo_init: no prefixMap attribute found");
talloc_free(mem_ctx);
return LDB_ERR_CONSTRAINT_VIOLATION;
}
@@ -132,7 +132,7 @@ static int schema_fsmo_init(struct ldb_module *module)
status = dsdb_load_oid_mappings_ldb(schema, prefix_val, info_val);
if (!W_ERROR_IS_OK(status)) {
ldb_debug_set(module->ldb, LDB_DEBUG_FATAL,
- "schema_fsmo_init: failed to load oid mappings: %s\n",
+ "schema_fsmo_init: failed to load oid mappings: %s",
win_errstr(status));
talloc_free(mem_ctx);
return LDB_ERR_CONSTRAINT_VIOLATION;
@@ -147,7 +147,7 @@ static int schema_fsmo_init(struct ldb_module *module)
&a_res);
if (ret != LDB_SUCCESS) {
ldb_debug_set(module->ldb, LDB_DEBUG_FATAL,
- "schema_fsmo_init: failed to search attributeSchema objects: %d:%s\n",
+ "schema_fsmo_init: failed to search attributeSchema objects: %d:%s",
ret, ldb_strerror(ret));
talloc_free(mem_ctx);
return ret;
@@ -166,7 +166,7 @@ static int schema_fsmo_init(struct ldb_module *module)
status = dsdb_attribute_from_ldb(schema, a_res->msgs[i], sa, sa);
if (!W_ERROR_IS_OK(status)) {
ldb_debug_set(module->ldb, LDB_DEBUG_FATAL,
- "schema_fsmo_init: failed to load attriute definition: %s:%s\n",
+ "schema_fsmo_init: failed to load attriute definition: %s:%s",
ldb_dn_get_linearized(a_res->msgs[i]->dn),
win_errstr(status));
talloc_free(mem_ctx);
@@ -186,7 +186,7 @@ static int schema_fsmo_init(struct ldb_module *module)
&c_res);
if (ret != LDB_SUCCESS) {
ldb_debug_set(module->ldb, LDB_DEBUG_FATAL,
- "schema_fsmo_init: failed to search classSchema objects: %d:%s\n",
+ "schema_fsmo_init: failed to search classSchema objects: %d:%s",
ret, ldb_strerror(ret));
talloc_free(mem_ctx);
return ret;
@@ -205,7 +205,7 @@ static int schema_fsmo_init(struct ldb_module *module)
status = dsdb_class_from_ldb(schema, c_res->msgs[i], sc, sc);
if (!W_ERROR_IS_OK(status)) {
ldb_debug_set(module->ldb, LDB_DEBUG_FATAL,
- "schema_fsmo_init: failed to load class definition: %s:%s\n",
+ "schema_fsmo_init: failed to load class definition: %s:%s",
ldb_dn_get_linearized(c_res->msgs[i]->dn),
win_errstr(status));
talloc_free(mem_ctx);
@@ -220,7 +220,7 @@ static int schema_fsmo_init(struct ldb_module *module)
ret = dsdb_set_schema(module->ldb, schema);
if (ret != LDB_SUCCESS) {
ldb_debug_set(module->ldb, LDB_DEBUG_FATAL,
- "schema_fsmo_init: dsdb_set_schema() failed: %d:%s\n",
+ "schema_fsmo_init: dsdb_set_schema() failed: %d:%s",
ret, ldb_strerror(ret));
talloc_free(mem_ctx);
return ret;
@@ -241,7 +241,7 @@ static int schema_fsmo_init(struct ldb_module *module)
talloc_steal(module, schema_fsmo);
ldb_debug(module->ldb, LDB_DEBUG_TRACE,
- "schema_fsmo_init: we are master: %s\n",
+ "schema_fsmo_init: we are master: %s",
(schema_fsmo->we_are_master?"yes":"no"));
talloc_free(mem_ctx);