summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/registry/ldb.c2
-rw-r--r--source4/lib/registry/patchfile.c8
-rw-r--r--source4/lib/registry/tools/regshell.c2
-rw-r--r--source4/lib/registry/tools/regtree.c4
4 files changed, 8 insertions, 8 deletions
diff --git a/source4/lib/registry/ldb.c b/source4/lib/registry/ldb.c
index d70489ac03..68639f5b5c 100644
--- a/source4/lib/registry/ldb.c
+++ b/source4/lib/registry/ldb.c
@@ -700,7 +700,7 @@ static WERROR ldb_set_value(struct hive_key *parent,
if (strlen(name) > 0) {
/* For a default value, we add/overwrite the attributes to/of the hive.
- For a normal value, we create new childs. */
+ For a normal value, we create a new child. */
if (!ldb_dn_add_child_fmt(msg->dn, "value=%s",
reg_ldb_escape(mem_ctx, name)))
{
diff --git a/source4/lib/registry/patchfile.c b/source4/lib/registry/patchfile.c
index 24d86abf48..0631e760cb 100644
--- a/source4/lib/registry/patchfile.c
+++ b/source4/lib/registry/patchfile.c
@@ -86,7 +86,7 @@ WERROR reg_generate_diff_key(struct registry_key *oldkey,
}
if (!W_ERROR_IS_OK(error2) && !W_ERROR_EQUAL(error2, WERR_BADFILE)) {
- DEBUG(0, ("Error occured while getting subkey by name: %s\n",
+ DEBUG(0, ("Error occurred while getting subkey by name: %s\n",
win_errstr(error2)));
talloc_free(mem_ctx);
return error2;
@@ -101,7 +101,7 @@ WERROR reg_generate_diff_key(struct registry_key *oldkey,
/* perform here also the recursive invocation */
error1 = reg_open_key(mem_ctx, oldkey, keyname1, &t1);
if (!W_ERROR_IS_OK(error1)) {
- DEBUG(0, ("Error occured while getting subkey by name: %s\n",
+ DEBUG(0, ("Error occurred while getting subkey by name: %s\n",
win_errstr(error1)));
talloc_free(mem_ctx);
return error1;
@@ -161,7 +161,7 @@ WERROR reg_generate_diff_key(struct registry_key *oldkey,
/* perform here also the recursive invocation */
error1 = reg_open_key(mem_ctx, newkey, keyname1, &t2);
if (!W_ERROR_IS_OK(error1)) {
- DEBUG(0, ("Error occured while getting subkey by name: %s\n",
+ DEBUG(0, ("Error occurred while getting subkey by name: %s\n",
win_errstr(error1)));
talloc_free(mem_ctx);
return error1;
@@ -387,7 +387,7 @@ static WERROR reg_diff_apply_del_key(void *_ctx, const char *key_name)
/* We can't proof here for success, because a common superkey could */
/* have been deleted before the subkey's (diff order). This removed */
- /* therefore all childs recursively and the "WERR_BADFILE" result is */
+ /* therefore all children recursively and the "WERR_BADFILE" result is */
/* expected. */
reg_key_del_abs(ctx, key_name);
diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c
index 314f063891..2bacaac6bc 100644
--- a/source4/lib/registry/tools/regshell.c
+++ b/source4/lib/registry/tools/regshell.c
@@ -282,7 +282,7 @@ static WERROR cmd_ls(struct regshell_context *ctx, int argc, char **argv)
}
if (!W_ERROR_EQUAL(error, WERR_NO_MORE_ITEMS)) {
- fprintf(stderr, "Error occured while browsing thru keys: %s\n",
+ fprintf(stderr, "Error occurred while browsing through keys: %s\n",
win_errstr(error));
return error;
}
diff --git a/source4/lib/registry/tools/regtree.c b/source4/lib/registry/tools/regtree.c
index 948ed49312..d266b604e3 100644
--- a/source4/lib/registry/tools/regtree.c
+++ b/source4/lib/registry/tools/regtree.c
@@ -69,7 +69,7 @@ static void print_tree(int level, struct registry_key *p,
talloc_free(mem_ctx);
if(!W_ERROR_EQUAL(error, WERR_NO_MORE_ITEMS)) {
- DEBUG(0, ("Error occured while fetching subkeys for '%s': %s\n",
+ DEBUG(0, ("Error occurred while fetching subkeys for '%s': %s\n",
name, win_errstr(error)));
}
@@ -87,7 +87,7 @@ static void print_tree(int level, struct registry_key *p,
talloc_free(mem_ctx);
if(!W_ERROR_EQUAL(error, WERR_NO_MORE_ITEMS)) {
- DEBUG(0, ("Error occured while fetching values for '%s': %s\n",
+ DEBUG(0, ("Error occurred while fetching values for '%s': %s\n",
name, win_errstr(error)));
}
}