Correct "occured" typos.

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>

3 files changed, 28 insertions, 28 deletions

diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
index 0c98147bf98..8ebf601689b 100644
--- a/lib/krb5_wrap/krb5_samba.c
+++ b/lib/krb5_wrap/krb5_samba.c
@@ -144,7 +144,7 @@ const krb5_data *krb5_princ_component(krb5_context context,
  *
  * @param[out] pkaddr   A Kerberos address to store tha address in.
  *
- * @return True on success, false if an error occured.
+ * @return True on success, false if an error occurred.
  */
 bool smb_krb5_sockaddr_to_kaddr(struct sockaddr_storage *paddr,
 				krb5_address *pkaddr)
@@ -177,7 +177,7 @@ bool smb_krb5_sockaddr_to_kaddr(struct sockaddr_storage *paddr,
  *
  * @param[in]  pkaddr A Kerberos address to store tha address in.
  *
- * @return True on success, false if an error occured.
+ * @return True on success, false if an error occurred.
  */
 bool smb_krb5_sockaddr_to_kaddr(struct sockaddr_storage *paddr,
 				krb5_address *pkaddr)
@@ -2566,7 +2566,7 @@ krb5_error_code smb_krb5_make_pac_checksum(TALLOC_CTX *mem_ctx,
  *
  * @param[in] principal The principal to get the realm from.
  *
- * @return An allocated string with the realm or NULL if an error occured.
+ * @return An allocated string with the realm or NULL if an error occurred.
  *
  * The caller must free the realm string with free() if not needed anymore.
  */
@@ -2744,7 +2744,7 @@ static char *smb_krb5_get_realm_from_hostname(TALLOC_CTX *mem_ctx,
  * @param[in]  default_realm The default_realm if we cannot get it from the
  *                           hostname or netbios name.
  *
- * @return A talloc'ed principal string or NULL if an error occured.
+ * @return A talloc'ed principal string or NULL if an error occurred.
  *
  * The caller needs to free the principal with talloc_free() if it isn't needed
  * anymore.
@@ -2796,7 +2796,7 @@ char *smb_krb5_get_principal_from_service_hostname(TALLOC_CTX *mem_ctx,
  *
  * @param[in]  mem_ctx  The talloc context to allocate the error string on.
  *
- * @return A talloc'ed error string or NULL if an error occured.
+ * @return A talloc'ed error string or NULL if an error occurred.
  *
  * The caller must free the returned error string with talloc_free() if not
  * needed anymore
diff --git a/lib/smbconf/smbconf.h b/lib/smbconf/smbconf.h
index 69a55dbf2e2..1804cb5905a 100644
--- a/lib/smbconf/smbconf.h
+++ b/lib/smbconf/smbconf.h
@@ -137,7 +137,7 @@ bool smbconf_changed(struct smbconf_ctx *ctx, struct smbconf_csn *csn,
  * @param[in] ctx       The smbconf context to drop the config.
  *
  * @return              SBC_ERR_OK on success, a corresponding sbcErr if an
- *                      error occured.
+ *                      error occurred.
  */
 sbcErr smbconf_drop(struct smbconf_ctx *ctx);
 
@@ -153,7 +153,7 @@ sbcErr smbconf_drop(struct smbconf_ctx *ctx);
  * @param[out] services  A pointer to store the services.
  *
  * @return              SBC_ERR_OK on success, a corresponding sbcErr if an
- *                      error occured.
+ *                      error occurred.
  *
  * @see smbconf_service
  */
@@ -174,7 +174,7 @@ sbcErr smbconf_get_config(struct smbconf_ctx *ctx,
  * @param[in] share_names A pointer to store the share names.
  *
  * @return              SBC_ERR_OK on success, a corresponding sbcErr if an
- *                      error occured.
+ *                      error occurred.
  */
 sbcErr smbconf_get_share_names(struct smbconf_ctx *ctx,
 			       TALLOC_CTX *mem_ctx,
@@ -200,7 +200,7 @@ bool smbconf_share_exists(struct smbconf_ctx *ctx, const char *servicename);
  * @param[in] servicename The name of the service to add.
  *
  * @return              SBC_ERR_OK on success, a corresponding sbcErr if an
- *                      error occured.
+ *                      error occurred.
  */
 sbcErr smbconf_create_share(struct smbconf_ctx *ctx, const char *servicename);
 
@@ -212,7 +212,7 @@ sbcErr smbconf_create_share(struct smbconf_ctx *ctx, const char *servicename);
  * @param[in] service   The definition for the added service.
  *
  * @return              SBC_ERR_OK on success, a corresponding sbcErr if an
- *                      error occured.
+ *                      error occurred.
  */
 sbcErr smbconf_create_set_share(struct smbconf_ctx *ctx,
 				struct smbconf_service *service);
@@ -230,7 +230,7 @@ sbcErr smbconf_create_set_share(struct smbconf_ctx *ctx,
  *                      share.
  *
  * @return              SBC_ERR_OK on success, a corresponding sbcErr if an
- *                      error occured.
+ *                      error occurred.
  *
  * @see smbconf_service
  */
@@ -247,7 +247,7 @@ sbcErr smbconf_get_share(struct smbconf_ctx *ctx,
  * @param[in] servicename The service name to delete.
  *
  * @return              SBC_ERR_OK on success, a corresponding sbcErr if an
- *                      error occured.
+ *                      error occurred.
  */
 sbcErr smbconf_delete_share(struct smbconf_ctx *ctx,
 			    const char *servicename);
@@ -264,7 +264,7 @@ sbcErr smbconf_delete_share(struct smbconf_ctx *ctx,
  * @param[in] valstr    The value to set.
  *
  * @return              SBC_ERR_OK on success, a corresponding sbcErr if an
- *                      error occured.
+ *                      error occurred.
  */
 sbcErr smbconf_set_parameter(struct smbconf_ctx *ctx,
 			     const char *service,
@@ -284,7 +284,7 @@ sbcErr smbconf_set_parameter(struct smbconf_ctx *ctx,
  * @param[in] val       The value to set.
  *
  * @return              SBC_ERR_OK on success, a corresponding sbcErr if an
- *                      error occured.
+ *                      error occurred.
  */
 sbcErr smbconf_set_global_parameter(struct smbconf_ctx *ctx,
 				    const char *param, const char *val);
@@ -303,7 +303,7 @@ sbcErr smbconf_set_global_parameter(struct smbconf_ctx *ctx,
  * @param[out] valstr   A pointer to store the value as a string.
  *
  * @return              SBC_ERR_OK on success, a corresponding sbcErr if an
- *                      error occured.
+ *                      error occurred.
  */
 sbcErr smbconf_get_parameter(struct smbconf_ctx *ctx,
 			     TALLOC_CTX *mem_ctx,
@@ -325,7 +325,7 @@ sbcErr smbconf_get_parameter(struct smbconf_ctx *ctx,
  * @param[out] valstr   A pointer to store the value as a string.
  *
  * @return              SBC_ERR_OK on success, a corresponding sbcErr if an
- *                      error occured.
+ *                      error occurred.
  */
 sbcErr smbconf_get_global_parameter(struct smbconf_ctx *ctx,
 				    TALLOC_CTX *mem_ctx,
@@ -342,7 +342,7 @@ sbcErr smbconf_get_global_parameter(struct smbconf_ctx *ctx,
  * @param[in] param     The name of the parameter to delete.
  *
  * @return              SBC_ERR_OK on success, a corresponding sbcErr if an
- *                      error occured.
+ *                      error occurred.
  */
 sbcErr smbconf_delete_parameter(struct smbconf_ctx *ctx,
 				const char *service, const char *param);
@@ -357,7 +357,7 @@ sbcErr smbconf_delete_parameter(struct smbconf_ctx *ctx,
  * @param[in] param     The name of the parameter to delete.
  *
  * @return              SBC_ERR_OK on success, a corresponding sbcErr if an
- *                      error occured.
+ *                      error occurred.
  */
 sbcErr smbconf_delete_global_parameter(struct smbconf_ctx *ctx,
 				       const char *param);
@@ -376,7 +376,7 @@ sbcErr smbconf_delete_global_parameter(struct smbconf_ctx *ctx,
  * @param[out] includes A pointer to store the paths of the included files.
  *
  * @return              SBC_ERR_OK on success, a corresponding sbcErr if an
- *                      error occured.
+ *                      error occurred.
  */
 sbcErr smbconf_get_includes(struct smbconf_ctx *ctx,
 			    TALLOC_CTX *mem_ctx,
@@ -395,7 +395,7 @@ sbcErr smbconf_get_includes(struct smbconf_ctx *ctx,
  * @param[out] includes A pointer to store the paths of the included files.
  *
  * @return              SBC_ERR_OK on success, a corresponding sbcErr if an
- *                      error occured.
+ *                      error occurred.
  */
 sbcErr smbconf_get_global_includes(struct smbconf_ctx *ctx,
 				   TALLOC_CTX *mem_ctx,
@@ -413,7 +413,7 @@ sbcErr smbconf_get_global_includes(struct smbconf_ctx *ctx,
  * @param[in]  includes A list of paths to include.
  *
  * @return              SBC_ERR_OK on success, a corresponding sbcErr if an
- *                      error occured.
+ *                      error occurred.
  */
 sbcErr smbconf_set_includes(struct smbconf_ctx *ctx,
 			    const char *service,
@@ -429,7 +429,7 @@ sbcErr smbconf_set_includes(struct smbconf_ctx *ctx,
  * @param[in]  includes A list of paths to include.
  *
  * @return              SBC_ERR_OK on success, a corresponding sbcErr if an
- *                      error occured.
+ *                      error occurred.
  */
 sbcErr smbconf_set_global_includes(struct smbconf_ctx *ctx,
 				   uint32_t num_includes,
@@ -443,7 +443,7 @@ sbcErr smbconf_set_global_includes(struct smbconf_ctx *ctx,
  * @param[in]  service  The name of the service to delete the includes from.
  *
  * @return              SBC_ERR_OK on success, a corresponding sbcErr if an
- *                      error occured.
+ *                      error occurred.
  */
 sbcErr smbconf_delete_includes(struct smbconf_ctx *ctx, const char *service);
 
@@ -453,7 +453,7 @@ sbcErr smbconf_delete_includes(struct smbconf_ctx *ctx, const char *service);
  * @param[in]  ctx      The smbconf context to use.
  *
  * @return              SBC_ERR_OK on success, a corresponding sbcErr if an
- *                      error occured.
+ *                      error occurred.
  */
 sbcErr smbconf_delete_global_includes(struct smbconf_ctx *ctx);
 
@@ -466,7 +466,7 @@ sbcErr smbconf_delete_global_includes(struct smbconf_ctx *ctx);
  * @param[in] ctx       The smbconf context to start the transaction.
  *
  * @return              SBC_ERR_OK on success, a corresponding sbcErr if an
- *                      error occured.
+ *                      error occurred.
  */
 sbcErr smbconf_transaction_start(struct smbconf_ctx *ctx);
 
@@ -479,7 +479,7 @@ sbcErr smbconf_transaction_start(struct smbconf_ctx *ctx);
  * @param[in] ctx       The smbconf context to commit the transaction.
  *
  * @return              SBC_ERR_OK on success, a corresponding sbcErr if an
- *                      error occured.
+ *                      error occurred.
  *
  * @see smbconf_transaction_start()
  */
@@ -494,7 +494,7 @@ sbcErr smbconf_transaction_commit(struct smbconf_ctx *ctx);
  * @param[in] ctx       The smbconf context to cancel the transaction.
  *
  * @return              SBC_ERR_OK on success, a corresponding sbcErr if an
- *                      error occured.
+ *                      error occurred.
  *
  * @see smbconf_transaction_start()
  */
diff --git a/lib/util/modules.c b/lib/util/modules.c
index 1f00dd810ae..c7e9f64f405 100644
--- a/lib/util/modules.c
+++ b/lib/util/modules.c
@@ -40,7 +40,7 @@ init_module_fn load_module(const char *path, bool is_probe, void **handle_out)
 	handle = dlopen(path, RTLD_NOW);
 
 	/* This call should reset any possible non-fatal errors that
-	   occured since last call to dl* functions */
+	   occurred since last call to dl* functions */
 	error = dlerror();
 
 	if (handle == NULL) {