From: Andreas Schneider Date: Thu, 3 Aug 2023 12:40:03 +0000 (+0200) Subject: s4:ntvfs: Fix code spelling X-Git-Tag: tevent-0.16.0~936 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6427dafe702609391beb545df3349172e656d7a4;p=thirdparty%2Fsamba.git s4:ntvfs: Fix code spelling Signed-off-by: Andreas Schneider Reviewed-by: Andrew Bartlett --- diff --git a/source4/ntvfs/cifs/README b/source4/ntvfs/cifs/README index 31720612c20..f9ab50c315a 100644 --- a/source4/ntvfs/cifs/README +++ b/source4/ntvfs/cifs/README @@ -1,6 +1,6 @@ This is the 'CIFS on CIFS' backend for Samba. It provides a NTVFS backend that talks to a remote CIFS server. The primary aim of this -backend is for debugging and development, although some poeple may +backend is for debugging and development, although some people may find it useful as a CIFS gateway. There are two modes of operation: Password specified and delegated diff --git a/source4/ntvfs/common/brlock_tdb.c b/source4/ntvfs/common/brlock_tdb.c index 77a864af328..22411733fe6 100644 --- a/source4/ntvfs/common/brlock_tdb.c +++ b/source4/ntvfs/common/brlock_tdb.c @@ -39,11 +39,11 @@ in this module a "DATA_BLOB *file_key" is a blob that uniquely identifies a file. For a local posix filesystem this will usually be a combination of the device and inode numbers of the file, but it can be anything - that uniquely idetifies a file for locking purposes, as long + that uniquely identifies a file for locking purposes, as long as it is applied consistently. */ -/* this struct is typicaly attached to tcon */ +/* this struct is typically attached to tcon */ struct brl_context { struct db_context *db; struct server_id server; @@ -248,7 +248,7 @@ static NTSTATUS brl_tdb_lock_failed(struct brl_handle *brlh, struct lock_struct /* * if the notify_ptr is non NULL, * it means that we're at the end of a pending lock - * and the real lock is requested after the timout went by + * and the real lock is requested after the timeout went by * In this case we need to remember the last_lock and always * give FILE_LOCK_CONFLICT */ diff --git a/source4/ntvfs/ipc/vfs_ipc.c b/source4/ntvfs/ipc/vfs_ipc.c index f6c1bf43e31..01e2a5deef4 100644 --- a/source4/ntvfs/ipc/vfs_ipc.c +++ b/source4/ntvfs/ipc/vfs_ipc.c @@ -1298,7 +1298,7 @@ static NTSTATUS ipc_ioctl(struct ntvfs_module_context *ntvfs, /* - initialialise the IPC backend, registering ourselves with the ntvfs subsystem + initialise the IPC backend, registering ourselves with the ntvfs subsystem */ NTSTATUS ntvfs_ipc_init(TALLOC_CTX *ctx) { diff --git a/source4/ntvfs/ntvfs.h b/source4/ntvfs/ntvfs.h index 02dc191f10d..b4595795609 100644 --- a/source4/ntvfs/ntvfs.h +++ b/source4/ntvfs/ntvfs.h @@ -275,7 +275,7 @@ struct ntvfs_request { */ uint64_t client_caps; - /* some statictics for the management tools */ + /* some statistics for the management tools */ struct { /* the system time when the request arrived */ struct timeval request_time; diff --git a/source4/ntvfs/posix/pvfs_resolve.c b/source4/ntvfs/posix/pvfs_resolve.c index cc3d72c2ed6..efe19b9dc91 100644 --- a/source4/ntvfs/posix/pvfs_resolve.c +++ b/source4/ntvfs/posix/pvfs_resolve.c @@ -314,7 +314,7 @@ static NTSTATUS pvfs_unix_path(struct pvfs_state *pvfs, const char *cifs_name, return NT_STATUS_OBJECT_NAME_INVALID; } if (p > p_start && (p[1] == '\\' || p[1] == '\0')) { - /* see if it is definately a "\\" or + /* see if it is definitely a "\\" or * a trailing "\". If it is then fail here, * and let the next layer up try again after * pvfs_reduce_name() if it wants to. This is @@ -353,7 +353,7 @@ static NTSTATUS pvfs_unix_path(struct pvfs_state *pvfs, const char *cifs_name, case '|': return NT_STATUS_OBJECT_NAME_INVALID; case '.': - /* see if it is definately a .. or + /* see if it is definitely a .. or . component. If it is then fail here, and let the next layer up try again after pvfs_reduce_name() if it wants to. This is diff --git a/source4/ntvfs/posix/pvfs_streams.c b/source4/ntvfs/posix/pvfs_streams.c index cacd8c19952..92102371674 100644 --- a/source4/ntvfs/posix/pvfs_streams.c +++ b/source4/ntvfs/posix/pvfs_streams.c @@ -426,7 +426,7 @@ static NTSTATUS pvfs_stream_load(struct pvfs_state *pvfs, } /* - the equvalent of pread() on a stream + the equivalent of pread() on a stream */ ssize_t pvfs_stream_read(struct pvfs_state *pvfs, struct pvfs_file_handle *h, void *data, size_t count, off_t offset) @@ -455,7 +455,7 @@ ssize_t pvfs_stream_read(struct pvfs_state *pvfs, /* - the equvalent of pwrite() on a stream + the equivalent of pwrite() on a stream */ ssize_t pvfs_stream_write(struct pvfs_state *pvfs, struct pvfs_file_handle *h, const void *data, size_t count, off_t offset) @@ -514,7 +514,7 @@ ssize_t pvfs_stream_write(struct pvfs_state *pvfs, } /* - the equvalent of truncate() on a stream + the equivalent of truncate() on a stream */ NTSTATUS pvfs_stream_truncate(struct pvfs_state *pvfs, struct pvfs_filename *name, int fd, off_t length) diff --git a/source4/ntvfs/posix/pvfs_unlink.c b/source4/ntvfs/posix/pvfs_unlink.c index a4b51d1d7d3..605ec103552 100644 --- a/source4/ntvfs/posix/pvfs_unlink.c +++ b/source4/ntvfs/posix/pvfs_unlink.c @@ -226,7 +226,7 @@ NTSTATUS pvfs_unlink(struct ntvfs_module_context *ntvfs, /* * disable async requests in the wildcard case - * untill we have proper tests for this + * until we have proper tests for this */ req->async_states->state &= ~NTVFS_ASYNC_STATE_MAY_ASYNC; diff --git a/source4/ntvfs/posix/pvfs_util.c b/source4/ntvfs/posix/pvfs_util.c index 6afb928d73c..2975e043070 100644 --- a/source4/ntvfs/posix/pvfs_util.c +++ b/source4/ntvfs/posix/pvfs_util.c @@ -173,7 +173,7 @@ NTSTATUS pvfs_copy_file(struct pvfs_state *pvfs, hash a string of the specified length. The string does not need to be null terminated - hash alghorithm changed to FNV1 by idra@samba.org (Simo Sorce). + hash algorithm changed to FNV1 by idra@samba.org (Simo Sorce). see http://www.isthe.com/chongo/tech/comp/fnv/index.html for a discussion on Fowler / Noll / Vo (FNV) Hash by one of it's authors */ diff --git a/source4/ntvfs/posix/vfs_posix.c b/source4/ntvfs/posix/vfs_posix.c index cbee8d9738a..8375def4d10 100644 --- a/source4/ntvfs/posix/vfs_posix.c +++ b/source4/ntvfs/posix/vfs_posix.c @@ -160,7 +160,7 @@ static int pvfs_state_destructor(struct pvfs_state *pvfs) /* * make sure we cleanup files and searches before anything else - * because there destructors need to acess the pvfs_state struct + * because there destructors need to access the pvfs_state struct */ for (f=pvfs->files.list; f; f=fn) { fn = f->next; @@ -356,7 +356,7 @@ static NTSTATUS pvfs_trans(struct ntvfs_module_context *ntvfs, } /* - initialialise the POSIX disk backend, registering ourselves with the ntvfs subsystem + initialise the POSIX disk backend, registering ourselves with the ntvfs subsystem */ NTSTATUS ntvfs_posix_init(TALLOC_CTX *ctx) { diff --git a/source4/ntvfs/simple/vfs_simple.c b/source4/ntvfs/simple/vfs_simple.c index 2fe20844821..000da41f066 100644 --- a/source4/ntvfs/simple/vfs_simple.c +++ b/source4/ntvfs/simple/vfs_simple.c @@ -1053,7 +1053,7 @@ static NTSTATUS svfs_trans(struct ntvfs_module_context *ntvfs, /* - initialialise the POSIX disk backend, registering ourselves with the ntvfs subsystem + initialise the POSIX disk backend, registering ourselves with the ntvfs subsystem */ NTSTATUS ntvfs_simple_init(TALLOC_CTX *ctx) { diff --git a/source4/ntvfs/sysdep/README b/source4/ntvfs/sysdep/README index a2a8f57c280..86b473e9156 100644 --- a/source4/ntvfs/sysdep/README +++ b/source4/ntvfs/sysdep/README @@ -1,4 +1,4 @@ -This directory contains OS depdendent interfaces to facilities that +This directory contains OS dependent interfaces to facilities that are only available on a few of our target systems, and require substantial code to abstract. diff --git a/source4/ntvfs/sysdep/inotify.c b/source4/ntvfs/sysdep/inotify.c index ba4b336c44e..94e0b170419 100644 --- a/source4/ntvfs/sysdep/inotify.c +++ b/source4/ntvfs/sysdep/inotify.c @@ -341,7 +341,7 @@ static NTSTATUS inotify_watch(struct sys_notify_context *ctx, } /* using IN_MASK_ADD allows us to cope with inotify() returning the same - watch descriptor for muliple watches on the same path */ + watch descriptor for multiple watches on the same path */ mask |= (IN_MASK_ADD | IN_ONLYDIR); /* get a new watch descriptor for this path */ @@ -388,7 +388,7 @@ static struct sys_notify_backend inotify = { }; /* - initialialise the inotify module + initialise the inotify module */ NTSTATUS sys_notify_inotify_init(TALLOC_CTX *); NTSTATUS sys_notify_inotify_init(TALLOC_CTX *ctx) diff --git a/source4/ntvfs/sysdep/sys_lease_linux.c b/source4/ntvfs/sysdep/sys_lease_linux.c index 566a9a3aaef..54c0007dffd 100644 --- a/source4/ntvfs/sysdep/sys_lease_linux.c +++ b/source4/ntvfs/sysdep/sys_lease_linux.c @@ -206,7 +206,7 @@ static struct sys_lease_ops linux_lease_ops = { }; /* - initialialise the linux lease module + initialise the linux lease module */ NTSTATUS sys_lease_linux_init(TALLOC_CTX *ctx) { diff --git a/source4/ntvfs/unixuid/vfs_unixuid.c b/source4/ntvfs/unixuid/vfs_unixuid.c index 995d7446136..a7729d2b16c 100644 --- a/source4/ntvfs/unixuid/vfs_unixuid.c +++ b/source4/ntvfs/unixuid/vfs_unixuid.c @@ -1,7 +1,7 @@ -/* +/* Unix SMB/CIFS implementation. - a pass-thru NTVFS module to setup a security context using unix + A pass-through NTVFS module to setup a security context using unix uid/gid Copyright (C) Andrew Tridgell 2004 @@ -10,12 +10,12 @@ it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . */ @@ -120,7 +120,7 @@ static int unixuid_event_nesting_hook(struct tevent_context *ev, *(struct security_unix_token **)stack_ptr = sec_ctx; if (samba_seteuid(0) != 0 || samba_setegid(0) != 0) { DEBUG(0,("%s: Failed to change to root\n", location)); - return -1; + return -1; } } else { /* called when we come out of a nesting level */ @@ -138,7 +138,7 @@ static int unixuid_event_nesting_hook(struct tevent_context *ev, status = set_unix_security(sec_ctx); talloc_free(sec_ctx); if (!NT_STATUS_IS_OK(status)) { - DEBUG(0,("%s: Failed to revert security context (%s)\n", + DEBUG(0,("%s: Failed to revert security context (%s)\n", location, nt_errstr(status))); return -1; } @@ -245,11 +245,11 @@ static NTSTATUS unixuid_connect(struct ntvfs_module_context *ntvfs, priv->last_token = NULL; ntvfs->private_data = priv; - tevent_loop_set_nesting_hook(ntvfs->ctx->event_ctx, + tevent_loop_set_nesting_hook(ntvfs->ctx->event_ctx, unixuid_event_nesting_hook, &unixuid_nesting_level); - /* we don't use PASS_THRU_REQ here, as the connect operation runs with + /* we don't use PASS_THRU_REQ here, as the connect operation runs with root privileges. This allows the backends to setup any database links they might need during the connect. */ status = ntvfs_next_connect(ntvfs, req, tcon); @@ -269,7 +269,7 @@ static NTSTATUS unixuid_disconnect(struct ntvfs_module_context *ntvfs) ntvfs->private_data = NULL; status = ntvfs_next_disconnect(ntvfs); - + return status; } @@ -520,7 +520,7 @@ static NTSTATUS unixuid_logoff(struct ntvfs_module_context *ntvfs, async setup */ static NTSTATUS unixuid_async_setup(struct ntvfs_module_context *ntvfs, - struct ntvfs_request *req, + struct ntvfs_request *req, void *private_data) { NTSTATUS status; @@ -573,7 +573,7 @@ static NTSTATUS unixuid_lock(struct ntvfs_module_context *ntvfs, set info on a open file */ static NTSTATUS unixuid_setfileinfo(struct ntvfs_module_context *ntvfs, - struct ntvfs_request *req, + struct ntvfs_request *req, union smb_setfileinfo *info) { NTSTATUS status; @@ -610,12 +610,12 @@ static NTSTATUS unixuid_lpq(struct ntvfs_module_context *ntvfs, return status; } -/* +/* list files in a directory matching a wildcard pattern */ static NTSTATUS unixuid_search_first(struct ntvfs_module_context *ntvfs, - struct ntvfs_request *req, union smb_search_first *io, - void *search_private, + struct ntvfs_request *req, union smb_search_first *io, + void *search_private, bool (*callback)(void *, const union smb_search_data *)) { NTSTATUS status; @@ -627,8 +627,8 @@ static NTSTATUS unixuid_search_first(struct ntvfs_module_context *ntvfs, /* continue a search */ static NTSTATUS unixuid_search_next(struct ntvfs_module_context *ntvfs, - struct ntvfs_request *req, union smb_search_next *io, - void *search_private, + struct ntvfs_request *req, union smb_search_next *io, + void *search_private, bool (*callback)(void *, const union smb_search_data *)) { NTSTATUS status; @@ -707,18 +707,18 @@ NTSTATUS ntvfs_unixuid_init(TALLOC_CTX *ctx) ops.name = "unixuid"; /* we register under all 3 backend types, as we are not type specific */ - ops.type = NTVFS_DISK; + ops.type = NTVFS_DISK; ret = ntvfs_register(&ops, &vers); if (!NT_STATUS_IS_OK(ret)) goto failed; - ops.type = NTVFS_PRINT; + ops.type = NTVFS_PRINT; ret = ntvfs_register(&ops, &vers); if (!NT_STATUS_IS_OK(ret)) goto failed; - ops.type = NTVFS_IPC; + ops.type = NTVFS_IPC; ret = ntvfs_register(&ops, &vers); if (!NT_STATUS_IS_OK(ret)) goto failed; - + failed: return ret; }