diff options
| -rw-r--r-- | ctdb/server/ctdb_recoverd.c | 2 | ||||
| -rw-r--r-- | lib/smbconf/pysmbconf.c | 2 | ||||
| -rw-r--r-- | lib/util/tfork.c | 2 | ||||
| -rw-r--r-- | nsswitch/wbinfo.c | 2 | ||||
| -rw-r--r-- | source4/torture/smb2/acls.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index bf3a66b0aaf..9d2cb6af9c9 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -395,7 +395,7 @@ static void ctdb_set_culprit_count(struct ctdb_recoverd *rec, struct ctdb_banning_state, len); if (t == NULL) { - DBG_WARNING("Memory allocation errror"); + DBG_WARNING("Memory allocation error"); return; } rec->banning_state = t; diff --git a/lib/smbconf/pysmbconf.c b/lib/smbconf/pysmbconf.c index 1b3c101005a..465876684ca 100644 --- a/lib/smbconf/pysmbconf.c +++ b/lib/smbconf/pysmbconf.c @@ -747,7 +747,7 @@ PyDoc_STRVAR(py_smbconf_doc, "types. Future, write based functions need a writable backend (registry).\n" "\n" "Note that the registry backend will be provided by a different\n" -"library module from the source3 tree (implemenation TBD).\n"); +"library module from the source3 tree (implementation TBD).\n"); static struct PyModuleDef moduledef = { PyModuleDef_HEAD_INIT, diff --git a/lib/util/tfork.c b/lib/util/tfork.c index 57a4e18638b..e3eaa199db5 100644 --- a/lib/util/tfork.c +++ b/lib/util/tfork.c @@ -572,7 +572,7 @@ static pid_t tfork_start_waiter_and_worker(struct tfork_state *state, /* * The "waiter" child. */ - process_set_title("tfork waiter", "tfork waiter proces"); + process_set_title("tfork waiter", "tfork waiter process"); CatchSignal(SIGCHLD, SIG_DFL); diff --git a/nsswitch/wbinfo.c b/nsswitch/wbinfo.c index de54373afe8..6148b204043 100644 --- a/nsswitch/wbinfo.c +++ b/nsswitch/wbinfo.c @@ -2551,7 +2551,7 @@ int main(int argc, const char **argv, char **envp) .argInfo = POPT_ARG_STRING, .arg = &string_arg, .val = OPT_CHANGE_SECRET_AT, - .descrip = "Change shared secret at Domain Controler" }, + .descrip = "Change shared secret at Domain Controller" }, { .longName = "ping-dc", .shortName = 'P', diff --git a/source4/torture/smb2/acls.c b/source4/torture/smb2/acls.c index a5df9da3b45..2f15ad27e48 100644 --- a/source4/torture/smb2/acls.c +++ b/source4/torture/smb2/acls.c @@ -2918,7 +2918,7 @@ done: * test SEC_FLAG_MAXIMUM_ALLOWED with not-granted access * * When access_mask contains SEC_FLAG_MAXIMUM_ALLOWED, the server must still - * proces other bits from access_mask. Eg if access_mask contains a right that + * process other bits from access_mask. Eg if access_mask contains a right that * the requester doesn't have, the function must validate that against the * effective permissions. */ |