s3:utils: Fix code spelling

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Joseph Sutton <josephsutton@catalyst.net.nz>

diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index f0e5e0afe926a7806696a66514a41b98caf90105..4f3d754a095c54fb1e00cde15305f4c98a3c8d90 100644 (file)
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -2039,7 +2039,7 @@ static int net_ads_dns_unregister(struct net_context *c,
                           "net ads dns unregister [hostname]\n"
                           "    %s\n",
                         _("Usage:"),
-                        _("Remove all IP Address entires for a given\n"
+                        _("Remove all IP Address entries for a given\n"
                            "    hostname from the Active Directory server.\n"));
                TALLOC_FREE(tmp_ctx);
                return -1;
@@ -2641,7 +2641,7 @@ static int net_ads_password(struct net_context *c, int argc, const char **argv)
        }
 
        /* we don't actually need a full connect, but it's the easy way to
-               fill in the KDC's addresss */
+               fill in the KDC's address */
        ads_connect(ads);
 
        if (!ads->config.realm) {

diff --git a/source3/utils/net_ads_gpo.c b/source3/utils/net_ads_gpo.c
index 1bae3e99e4aef15e43b29a677abe06dd4ef41ba0..12d8e22d9725420bc255c47b87d48e3718581fea 100644 (file)
--- a/source3/utils/net_ads_gpo.c
+++ b/source3/utils/net_ads_gpo.c
@@ -316,7 +316,7 @@ Arguments:
 
 This function performs following operations:
 1. Create  talloc context using talloc_init
-2. Preform ads_startup()
+2. Perform ads_startup()
 3. Call ads_get_gpo() to retrieve gpo details inside 'struct GROUP_POLICY_OBJECT'
 4. Call dumps_gpo() to dump GPO on stdout
 */

diff --git a/source3/utils/net_cache.c b/source3/utils/net_cache.c
index 5691f04d8d6827db011e308c7da7615085c96b6f..a5a67ea4ced7dbbc141117e41a97c37124343396 100644 (file)
--- a/source3/utils/net_cache.c
+++ b/source3/utils/net_cache.c
@@ -305,7 +305,7 @@ static int net_cache_search(struct net_context *c, int argc, const char **argv)
  * List the contents of the cache
  *
  * @param c    A net_context structure
- * @param argv ignored in this functionailty
+ * @param argv ignored in this functionality
  * @return always returns 0
  **/
 static int net_cache_list(struct net_context *c, int argc, const char **argv)

diff --git a/source3/utils/net_registry_check.c b/source3/utils/net_registry_check.c
index d227ffa5ae362d258f19a1acbc7a9903bfebb1ec..6cb92565138e324b916f2c604c1a2fae8ad5b725 100644 (file)
--- a/source3/utils/net_registry_check.c
+++ b/source3/utils/net_registry_check.c
@@ -656,7 +656,7 @@ static bool srprs_path(const char **ptr, const char* prefix, char sep,
        return true;
 }
 
-/* Fixme: this dosn't work in the general multibyte char case.
+/* Fixme: this doesn't work in the general multibyte char case.
    see string_replace()
 */
 static bool normalize_path_internal(char* path, char sep) {

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 1405f773838e750977d78a35c3c9b5f549397728..a20d042ad5889858ae7e5e642e3595cf0a9f5888 100644 (file)
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -7498,7 +7498,7 @@ bool net_rpc_check(struct net_context *c, unsigned flags)
        return ret;
 }
 
-/* syncronise sam database via samsync rpc calls */
+/* synchronise sam database via samsync rpc calls */
 static int rpc_vampire(struct net_context *c, int argc, const char **argv)
 {
        struct functable func[] = {
@@ -7800,9 +7800,9 @@ int rpc_printer_migrate(struct net_context *c, int argc, const char **argv)
                        "forms",
                        rpc_printer_migrate_forms,
                        NET_TRANSPORT_RPC,
-                       N_("Migrate froms to local server"),
+                       N_("Migrate forms to local server"),
                        N_("net rpc printer migrate forms\n"
-                          "    Migrate froms to local server")
+                          "    Migrate forms to local server")
                },
                {
                        "printers",

diff --git a/source3/utils/net_rpc_conf.c b/source3/utils/net_rpc_conf.c
index a68d3f70607890b35161eaefdb072174091acf68..4ae1e72a7c07008dd31b98535eede012751951ca 100644 (file)
--- a/source3/utils/net_rpc_conf.c
+++ b/source3/utils/net_rpc_conf.c
@@ -1849,7 +1849,7 @@ static NTSTATUS rpc_conf_setparm_internal(struct net_context *c,
                                  "createkey opened existing %s\n",
                                  service_name));
 
-                       /* delete posibly existing value */
+                       /* delete possibly existing value */
                        status = rpc_conf_del_value(frame,
                                                    b,
                                                    &key_hnd,
@@ -2149,7 +2149,7 @@ static NTSTATUS rpc_conf_setincludes_internal(struct net_context *c,
                        DEBUG(5, ("net rpc conf setincludes:"
                                        "createkey opened existing %s\n", argv[0]));
 
-                       /* delete posibly existing value */
+                       /* delete possibly existing value */
                        status = rpc_conf_del_value(frame,
                                                    b,
                                                    &key_hnd,

diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c
index 9b17395c16f775e915f81945c5d8b98bfcf09611..f72203f688f367fad63f6c463665cbc135c407da 100644 (file)
--- a/source3/utils/net_rpc_printer.c
+++ b/source3/utils/net_rpc_printer.c
@@ -348,7 +348,7 @@ NTSTATUS net_copy_file(struct net_context *c,
                                O_RDWR|O_CREAT|O_TRUNC, DENY_NONE, &fnum_dst);
 
                if (!NT_STATUS_IS_OK(nt_status)) {
-                       DEBUGADD(1,("cannot create file %s on destination server: %s\n", 
+                       DEBUGADD(1,("cannot create file %s on destination server: %s\n",
                                dst_name, nt_errstr(nt_status)));
                        goto out;
                }
@@ -1166,9 +1166,9 @@ out:
  * argc, argv which are passed through.
  *
  * @param c    A net_context structure
- * @param domain_sid The domain sid aquired from the remote server
+ * @param domain_sid The domain sid acquired from the remote server
  * @param cli A cli_state connected to the server.
- * @param mem_ctx Talloc context, destoyed on compleation of the function.
+ * @param mem_ctx Talloc context, destroyed on completion of the function.
  * @param argc  Standard main() style argc
  * @param argv  Standard main() style argv.  Initial components are already
  *              stripped
@@ -1218,9 +1218,9 @@ NTSTATUS rpc_printer_list_internals(struct net_context *c,
  * argc, argv which are passed through.
  *
  * @param c    A net_context structure
- * @param domain_sid The domain sid aquired from the remote server
+ * @param domain_sid The domain sid acquired from the remote server
  * @param cli A cli_state connected to the server.
- * @param mem_ctx Talloc context, destoyed on compleation of the function.
+ * @param mem_ctx Talloc context, destroyed on completion of the function.
  * @param argc  Standard main() style argc
  * @param argv  Standard main() style argv.  Initial components are already
  *              stripped
@@ -1284,7 +1284,7 @@ done:
  * Publish print-queues with args-wrapper
  *
  * @param cli A cli_state connected to the server.
- * @param mem_ctx Talloc context, destoyed on compleation of the function.
+ * @param mem_ctx Talloc context, destroyed on completion of the function.
  * @param argc  Standard main() style argc
  * @param argv  Standard main() style argv.  Initial components are already
  *              stripped
@@ -1439,9 +1439,9 @@ NTSTATUS rpc_printer_publish_update_internals(struct net_context *c,
  * argc, argv which are passed through.
  *
  * @param c    A net_context structure
- * @param domain_sid The domain sid aquired from the remote server
+ * @param domain_sid The domain sid acquired from the remote server
  * @param cli A cli_state connected to the server.
- * @param mem_ctx Talloc context, destoyed on compleation of the function.
+ * @param mem_ctx Talloc context, destroyed on completion of the function.
  * @param argc  Standard main() style argc
  * @param argv  Standard main() style argv.  Initial components are already
  *              stripped
@@ -1534,9 +1534,9 @@ done:
  * argc, argv which are passed through.
  *
  * @param c    A net_context structure
- * @param domain_sid The domain sid aquired from the remote server
+ * @param domain_sid The domain sid acquired from the remote server
  * @param cli A cli_state connected to the server.
- * @param mem_ctx Talloc context, destoyed on compleation of the function.
+ * @param mem_ctx Talloc context, destroyed on completion of the function.
  * @param argc  Standard main() style argc
  * @param argv  Standard main() style argv.  Initial components are already
  *              stripped
@@ -1697,9 +1697,9 @@ done:
  * argc, argv which are passed through.
  *
  * @param c    A net_context structure
- * @param domain_sid The domain sid aquired from the remote server
+ * @param domain_sid The domain sid acquired from the remote server
  * @param cli A cli_state connected to the server.
- * @param mem_ctx Talloc context, destoyed on compleation of the function.
+ * @param mem_ctx Talloc context, destroyed on completion of the function.
  * @param argc  Standard main() style argc
  * @param argv  Standard main() style argv.  Initial components are already
  *              stripped
@@ -1871,9 +1871,9 @@ done:
  * argc, argv which are passed through.
  *
  * @param c    A net_context structure
- * @param domain_sid The domain sid aquired from the remote server
+ * @param domain_sid The domain sid acquired from the remote server
  * @param cli A cli_state connected to the server.
- * @param mem_ctx Talloc context, destoyed on compleation of the function.
+ * @param mem_ctx Talloc context, destroyed on completion of the function.
  * @param argc  Standard main() style argc
  * @param argv  Standard main() style argv.  Initial components are already
  *              stripped
@@ -2094,9 +2094,9 @@ done:
  * argc, argv which are passed through.
  *
  * @param c    A net_context structure
- * @param domain_sid The domain sid aquired from the remote server
+ * @param domain_sid The domain sid acquired from the remote server
  * @param cli A cli_state connected to the server.
- * @param mem_ctx Talloc context, destoyed on compleation of the function.
+ * @param mem_ctx Talloc context, destroyed on completion of the function.
  * @param argc  Standard main() style argc
  * @param argv  Standard main() style argv.  Initial components are already
  *              stripped
@@ -2260,9 +2260,9 @@ done:
  * argc, argv which are passed through.
  *
  * @param c    A net_context structure
- * @param domain_sid The domain sid aquired from the remote server
+ * @param domain_sid The domain sid acquired from the remote server
  * @param cli A cli_state connected to the server.
- * @param mem_ctx Talloc context, destoyed on compleation of the function.
+ * @param mem_ctx Talloc context, destroyed on completion of the function.
  * @param argc  Standard main() style argc
  * @param argv  Standard main() style argv.  Initial components are already
  *              stripped

diff --git a/source3/utils/net_rpc_rights.c b/source3/utils/net_rpc_rights.c
index 57267b29e9b7c70a0efd683893f59502e347ac24..3d861f61628993f180aa73832b76d0a7bf0580d6 100644 (file)
--- a/source3/utils/net_rpc_rights.c
+++ b/source3/utils/net_rpc_rights.c
@@ -364,7 +364,7 @@ static NTSTATUS rpc_rights_list_internal(struct net_context *c,
        if ( !NT_STATUS_IS_OK(status) )
                return status;
 
-       /* backwards compatibility; just list available privileges if no arguement */
+       /* backwards compatibility; just list available privileges if no argument */
 
        if (argc == 0) {
                status = enum_privileges(pipe_hnd, mem_ctx, &pol );

diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index 6e6a5d932bece6b44f78b1b35adf284324efff80..e3fb60fd88411e34d3918f1d7e15cc306c8048ac 100644 (file)
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -1194,7 +1194,7 @@ out:
  * Callback handler to handle child elements processed by cli_list,  we attempt
  * to propagate inheritable ace(s) to each child via the function
  * propagate_inherited_aces. Children that are themselves directories are passed
- * to cli_list again ( to decend the directory structure )
+ * to cli_list again ( to descend the directory structure )
  */
 static NTSTATUS cacl_set_cb(struct file_info *f,
                           const char *mask, void *state)
@@ -1356,7 +1356,7 @@ out:
 
 
 /*
- * Wrapper around cl_list to decend the directory tree pointed to by 'filename',
+ * Wrapper around cl_list to descend the directory tree pointed to by 'filename',
  * helper callback function 'cacl_set_cb' handles the child elements processed
  * by cli_list.
  */
@@ -1445,7 +1445,7 @@ static int inheritance_cacl_set(char *filename,
 
        /*
         * strictly speaking it could be considered an error if a file was
-        * specificied with '--propagate-inheritance'. However we really want
+        * specified with '--propagate-inheritance'. However we really want
         * to eventually get rid of '--propagate-inheritance' so we will be
         * more forgiving here and instead just exit early.
         */