summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/dynconfig/dynconfig.c2
-rw-r--r--source4/kdc/kpasswdd.c2
-rw-r--r--source4/libnet/libnet_join.c2
-rw-r--r--source4/nbt_server/wins/winsserver.c4
-rw-r--r--source4/smbd/process_single.c2
-rw-r--r--source4/smbd/server.c2
-rw-r--r--source4/smbd/service_named_pipe.c2
7 files changed, 8 insertions, 8 deletions
diff --git a/source4/dynconfig/dynconfig.c b/source4/dynconfig/dynconfig.c
index e0cabef317..5af69bfe6b 100644
--- a/source4/dynconfig/dynconfig.c
+++ b/source4/dynconfig/dynconfig.c
@@ -85,5 +85,5 @@ _PUBLIC_ const char *dyn_WINBINDD_SOCKET_DIR = WINBINDD_SOCKET_DIR;
/** Where to find the winbindd privileged socket */
_PUBLIC_ const char *dyn_WINBINDD_PRIVILEGED_SOCKET_DIR = WINBINDD_PRIVILEGED_SOCKET_DIR;
-/** Where to find the NTP signing deamon socket */
+/** Where to find the NTP signing daemon socket */
_PUBLIC_ const char *dyn_NTP_SIGND_SOCKET_DIR = NTP_SIGND_SOCKET_DIR;
diff --git a/source4/kdc/kpasswdd.c b/source4/kdc/kpasswdd.c
index 2f4ebe0557..e65f25d820 100644
--- a/source4/kdc/kpasswdd.c
+++ b/source4/kdc/kpasswdd.c
@@ -158,7 +158,7 @@ static bool kpasswd_make_pwchange_reply(struct kdc_server *kdc,
/*
A user password change
- Return true if there is a valid error packet (or sucess) formed in
+ Return true if there is a valid error packet (or success) formed in
the error_blob
*/
static bool kpasswdd_change_password(struct kdc_server *kdc,
diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c
index 5abe88bb89..84d3250c31 100644
--- a/source4/libnet/libnet_join.c
+++ b/source4/libnet/libnet_join.c
@@ -553,7 +553,7 @@ NTSTATUS libnet_JoinDomain(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, stru
if (r->in.level == LIBNET_JOINDOMAIN_AUTOMATIC) {
connect_with_info->out.domain_name = talloc_strdup(tmp_ctx, r->in.domain_name);
} else {
- /* Bugger, we just lost our way to automaticly find the domain name */
+ /* Bugger, we just lost our way to automatically find the domain name */
connect_with_info->out.domain_name = talloc_strdup(tmp_ctx, lp_workgroup(ctx->lp_ctx));
connect_with_info->out.realm = talloc_strdup(tmp_ctx, lp_realm(ctx->lp_ctx));
}
diff --git a/source4/nbt_server/wins/winsserver.c b/source4/nbt_server/wins/winsserver.c
index eab3f20d78..95d22242b3 100644
--- a/source4/nbt_server/wins/winsserver.c
+++ b/source4/nbt_server/wins/winsserver.c
@@ -281,8 +281,8 @@ static void wins_wack_allow(struct nbtd_wins_wack_state *s)
rec->registered_by = s->src->addr;
/*
- * now remove all addresses that're the client doesn't hold anymore
- * and update the time stamp and owner for the ownes that are still there
+ * now remove all addresses that the client doesn't hold anymore
+ * and update the time stamp and owner for the ones that are still there
*/
for (i=0; rec->addresses[i]; i++) {
bool found = false;
diff --git a/source4/smbd/process_single.c b/source4/smbd/process_single.c
index f873de47af..ec5f529aa1 100644
--- a/source4/smbd/process_single.c
+++ b/source4/smbd/process_single.c
@@ -55,7 +55,7 @@ static void single_accept_connection(struct tevent_context *ev,
/* this looks strange, but is correct.
We can only be here if woken up from select, due to
- an incomming connection.
+ an incoming connection.
We need to throttle things until the system clears
enough resources to handle this new socket.
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 91fd553939..ce278fdaf6 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -141,7 +141,7 @@ static void setup_signals(void)
#endif
/* POSIX demands that signals are inherited. If the invoking process has
- * these signals masked, we will have problems, as we won't recieve them. */
+ * these signals masked, we will have problems, as we won't receive them. */
BlockSignals(false, SIGHUP);
BlockSignals(false, SIGTERM);
diff --git a/source4/smbd/service_named_pipe.c b/source4/smbd/service_named_pipe.c
index 93ae60d69a..c10f43273c 100644
--- a/source4/smbd/service_named_pipe.c
+++ b/source4/smbd/service_named_pipe.c
@@ -100,7 +100,7 @@ static NTSTATUS named_pipe_recv_auth_request(void *private_data,
/*
* make sure nothing happens on the socket untill the
- * real implemenation takes over
+ * real implementation takes over
*/
packet_recv_disable(pipe_conn->packet);