From: Andreas Schneider Date: Fri, 30 Jun 2023 10:10:26 +0000 (+0200) Subject: s3:include: Fix code spelling X-Git-Tag: talloc-2.4.1~101 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0bfdefffc8b269674e4ffeb273170ad68f8efa32;p=thirdparty%2Fsamba.git s3:include: Fix code spelling Signed-off-by: Andreas Schneider Reviewed-by: Joseph Sutton Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Wed Jul 5 07:32:15 UTC 2023 on atb-devel-224 --- diff --git a/source3/include/fake_file.h b/source3/include/fake_file.h index c267df25188..434bc485d5e 100644 --- a/source3/include/fake_file.h +++ b/source3/include/fake_file.h @@ -1,6 +1,6 @@ /* Unix SMB/CIFS implementation. - FAKE FILE suppport, for faking up special files windows want access to + FAKE FILE support, for faking up special files windows want access to Copyright (C) Stefan (metze) Metzmacher 2003 This program is free software; you can redistribute it and/or modify diff --git a/source3/include/idmap.h b/source3/include/idmap.h index dce60f1f76d..647badd4b7d 100644 --- a/source3/include/idmap.h +++ b/source3/include/idmap.h @@ -1,6 +1,6 @@ #ifndef _IDMAP_H_ #define _IDMAP_H_ -/* +/* Unix SMB/CIFS implementation. Idmap headers @@ -22,7 +22,7 @@ along with this program. If not, see . */ -/* The interface version specifier. +/* The interface version specifier. Updated to 3 for enum types by JRA. */ /* Updated to 4, completely new interface, SSS */ @@ -61,7 +61,7 @@ struct idmap_methods { the uid/gid and type. Gets back the SID. */ NTSTATUS (*unixids_to_sids)(struct idmap_domain *dom, struct id_map **ids); - /* Map an arry of SIDs to uids/gids. The caller sets the SID + /* Map an array of SIDs to uids/gids. The caller sets the SID and type and gets back a uid or gid. */ NTSTATUS (*sids_to_unixids)(struct idmap_domain *dom, struct id_map **ids); diff --git a/source3/include/idmap_autorid_tdb.h b/source3/include/idmap_autorid_tdb.h index 36a595ff83f..aa65222ecd6 100644 --- a/source3/include/idmap_autorid_tdb.h +++ b/source3/include/idmap_autorid_tdb.h @@ -86,7 +86,7 @@ NTSTATUS idmap_autorid_acquire_range(struct db_context *db, struct autorid_range_config *range); /** - * Delete a domain#index <-> range maping from the database. + * Delete a domain#index <-> range mapping from the database. * The mapping is specified by the sid and index. * If force == true, invalid mapping records are deleted as far * as possible, otherwise they are left untouched. @@ -97,7 +97,7 @@ NTSTATUS idmap_autorid_delete_range_by_sid(struct db_context *db, bool force); /** - * Delete a domain#index <-> range maping from the database. + * Delete a domain#index <-> range mapping from the database. * The mapping is specified by the range number. * If force == true, invalid mapping records are deleted as far * as possible, otherwise they are left untouched. diff --git a/source3/include/libsmbclient.h b/source3/include/libsmbclient.h index 6901b0bcdcb..47eae80ca17 100644 --- a/source3/include/libsmbclient.h +++ b/source3/include/libsmbclient.h @@ -836,7 +836,7 @@ smbc_setOptionUseNTHash(SMBCCTX *c, smbc_bool b); /** * @brief Set the 'client min protocol' and the 'client max protocol'. * - * IMPORTANT: This overrrides the values 'client min protocol' and 'client max + * IMPORTANT: This overrides the values 'client min protocol' and 'client max * protocol' set in the smb.conf file! * * @param[in] c The smbc context to use. @@ -1223,7 +1223,7 @@ SMBCCTX * smbc_new_context(void); * @param shutdown_ctx If 1, all connections and files will be closed even if they are busy. * * - * @return Returns 0 on succes. Returns 1 on failure with errno set: + * @return Returns 0 on success. Returns 1 on failure with errno set: * - EBUSY Server connections are still used, Files are open or cache * could not be purged * - EBADF context == NULL @@ -1428,7 +1428,7 @@ ssize_t smbc_read(int fd, void *buf, size_t bufsize); * * @param fd Open file handle from smbc_open() or smbc_creat() * - * @param buf Pointer to buffer to recieve read data + * @param buf Pointer to buffer to receive read data * * @param bufsize Size of buf in bytes * @@ -1681,7 +1681,7 @@ const struct libsmb_file_info *smbc_readdirplus2(unsigned int dh, * * @return The current location in the directory stream or -1 * if an error occur. The current location is not - * an offset. Becuase of the implementation, it is a + * an offset. Because of the implementation, it is a * handle that allows the library to find the entry * later. * - EBADF dh is not a valid directory handle @@ -1714,7 +1714,7 @@ off_t smbc_telldir(int dh); * @see smbc_telldir() * * - * @todo In what does the reture and errno values mean? + * @todo In what does the return and errno values mean? */ int smbc_lseekdir(int fd, off_t offset); @@ -1924,7 +1924,7 @@ int smbc_ftruncate(int fd, off_t size); * permissions of * * @param mode The permissions to set: - * - Put good explaination of permissions here! + * - Put good explanation of permissions here! * * @return 0 on success, < 0 on error with errno set: * - EPERM The effective UID does not match the owner @@ -1933,7 +1933,7 @@ int smbc_ftruncate(int fd, off_t size); * - ENOMEM Insufficient was available. * - ENOENT file or directory does not exist * - * @todo Actually implement this fuction? + * @todo Actually implement this function? * * @todo Are errno values complete and correct? */ @@ -2768,7 +2768,7 @@ int smbc_print_file(const char *fname, const char *printq); * @param fname The URL of the print share to print to? * * @returns A file handle for the print file if successful. - * Returns -1 if an error ocurred and errno has the values + * Returns -1 if an error occurred and errno has the values * - EINVAL fname was NULL or smbc_init not called. * - all errors returned by smbc_open * @@ -2810,7 +2810,7 @@ int smbc_unlink_print_job(const char *purl, int id); * @param srv pointer to server to remove * * @return On success, 0 is returned. 1 is returned if the server could not - * be removed. Also useable outside libsmbclient. + * be removed. Also usable outside libsmbclient. */ int smbc_remove_unused_server(SMBCCTX * context, SMBCSRV * srv); @@ -2962,7 +2962,7 @@ smbc_thread_posix(void); * * @param lock_mutex * Lock a mutex. This function should expect three parameters: plock, - * lock_type, and location. The mutex aassociated with identifier plock + * lock_type, and location. The mutex associated with identifier plock * should be locked if lock_type is 1, and unlocked if lock_type is 2. The * location parameter can be used for debugging, as it contains the * compiler-provided __location__ of the call. diff --git a/source3/include/local.h b/source3/include/local.h index db53698ec44..95be8ee2342 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -115,7 +115,7 @@ /* shall we support browse requests via a FIFO to nmbd? */ #define ENABLE_FIFO 1 -/* how long (in miliseconds) to wait for a socket connect to happen */ +/* how long (in milliseconds) to wait for a socket connect to happen */ #define LONG_CONNECT_TIMEOUT 30000 #define SHORT_CONNECT_TIMEOUT 5000 @@ -125,12 +125,12 @@ /* the directory to sit in when idle */ /* #define IDLE_DIR "/" */ -/* Timout (in seconds) to wait for an oplock break +/* Timeout (in seconds) to wait for an oplock break message to return from the client. */ #define OPLOCK_BREAK_TIMEOUT 35 -/* Timout (in seconds) to add to the oplock break timeout +/* Timeout (in seconds) to add to the oplock break timeout to wait for the smbd to smbd message to return. */ #define OPLOCK_BREAK_TIMEOUT_FUDGEFACTOR 2 diff --git a/source3/include/messages.h b/source3/include/messages.h index 79e63eccd53..23c90f73e25 100644 --- a/source3/include/messages.h +++ b/source3/include/messages.h @@ -74,10 +74,10 @@ void messaging_deregister(struct messaging_context *ctx, uint32_t msg_type, /** * CAVEAT: * - * While the messaging_send*() functions are synchronuous by API, + * While the messaging_send*() functions are synchronous by API, * they trigger a tevent-based loop upon sending bigger messages. * - * Hence callers should not use these in purely synchonous code, + * Hence callers should not use these in purely synchronous code, * but run a tevent_loop instead. */ NTSTATUS messaging_send(struct messaging_context *msg_ctx, diff --git a/source3/include/nameserv.h b/source3/include/nameserv.h index 29b2d876e0d..8fbe5a33a29 100644 --- a/source3/include/nameserv.h +++ b/source3/include/nameserv.h @@ -209,7 +209,7 @@ struct nmb_data { time_t refresh_time; /* The time the record should be refreshed. */ uint64_t id; /* unique id */ - struct in_addr wins_ip; /* the adress of the wins server this record comes from */ + struct in_addr wins_ip; /* the address of the wins server this record comes from */ int wins_flags; /* similar to the netbios flags but different ! */ }; diff --git a/source3/include/passdb.h b/source3/include/passdb.h index 57f1b504941..5ee60d35196 100644 --- a/source3/include/passdb.h +++ b/source3/include/passdb.h @@ -1,4 +1,4 @@ -/* +/* Unix SMB/CIFS implementation. passdb structures and parameters Copyright (C) Gerald Carter 2001 @@ -165,7 +165,7 @@ NTSTATUS pdb_create_builtin_alias(uint32_t rid, gid_t gid); #define NEW_PW_FORMAT_SPACE_PADDED_LEN 14 -/* Password history contants. */ +/* Password history constants. */ #define PW_HISTORY_SALT_LEN 16 #define SALTED_MD5_HASH_LEN 16 #define PW_HISTORY_ENTRY_LEN (PW_HISTORY_SALT_LEN+SALTED_MD5_HASH_LEN) @@ -309,7 +309,7 @@ struct samu { /* a tag for who added the private methods */ const struct pdb_methods *backend_private_methods; - void *backend_private_data; + void *backend_private_data; void (*backend_private_data_free_fn)(void **); /* maintain a copy of the user's struct passwd */ @@ -396,12 +396,12 @@ enum pdb_policy_type { #define PDB_CAP_TRUSTED_DOMAINS_EX 0x0004 /***************************************************************** - Functions to be implemented by the new (v2) passdb API + Functions to be implemented by the new (v2) passdb API ****************************************************************/ /* * This next constant specifies the version number of the PASSDB interface - * this SAMBA will load. Increment this if *ANY* changes are made to the interface. + * this SAMBA will load. Increment this if *ANY* changes are made to the interface. * Changed interface to fix int -> size_t problems. JRA. * There's no point in allocating arrays in * samr_lookup_rids twice. It was done in the srv_samr_nt.c code as well as in @@ -423,7 +423,7 @@ enum pdb_policy_type { #define PASSDB_INTERFACE_VERSION 25 -struct pdb_methods +struct pdb_methods { const char *name; /* What name got this module */ @@ -564,13 +564,13 @@ struct pdb_methods struct pdb_search *search, const struct dom_sid *sid); - /* + /* * Instead of passing down a gid or uid, this function sends down a pointer - * to a unixid. + * to a unixid. * * This acts as an in-out variable so that the idmap functions can correctly * receive ID_TYPE_BOTH, filling in cache details correctly rather than forcing - * the cache to store ID_TYPE_UID or ID_TYPE_GID. + * the cache to store ID_TYPE_UID or ID_TYPE_GID. */ bool (*id_to_sid)(struct pdb_methods *methods, struct unixid *id, struct dom_sid *sid); @@ -582,16 +582,16 @@ struct pdb_methods bool (*get_trusteddom_pw)(struct pdb_methods *methods, - const char *domain, char** pwd, + const char *domain, char** pwd, struct dom_sid *sid, time_t *pass_last_set_time); NTSTATUS (*get_trusteddom_creds)(struct pdb_methods *methods, const char *domain, TALLOC_CTX *mem_ctx, struct cli_credentials **creds); - bool (*set_trusteddom_pw)(struct pdb_methods *methods, + bool (*set_trusteddom_pw)(struct pdb_methods *methods, const char* domain, const char* pwd, const struct dom_sid *sid); - bool (*del_trusteddom_pw)(struct pdb_methods *methods, + bool (*del_trusteddom_pw)(struct pdb_methods *methods, const char *domain); NTSTATUS (*enum_trusteddoms)(struct pdb_methods *methods, TALLOC_CTX *mem_ctx, uint32_t *num_domains, @@ -898,13 +898,13 @@ NTSTATUS pdb_lookup_rids(const struct dom_sid *domain_sid, bool pdb_get_account_policy(enum pdb_policy_type type, uint32_t *value); bool pdb_set_account_policy(enum pdb_policy_type type, uint32_t value); bool pdb_get_seq_num(time_t *seq_num); -/* +/* * Instead of passing down a gid or uid, this function sends down a pointer - * to a unixid. + * to a unixid. * * This acts as an in-out variable so that the idmap functions can correctly * receive ID_TYPE_BOTH, filling in cache details correctly rather than forcing - * the cache to store ID_TYPE_UID or ID_TYPE_GID. + * the cache to store ID_TYPE_UID or ID_TYPE_GID. */ bool pdb_id_to_sid(struct unixid *id, struct dom_sid *sid); bool pdb_sid_to_id(const struct dom_sid *sid, struct unixid *id); diff --git a/source3/include/smb.h b/source3/include/smb.h index 704fe559203..487a8b316d8 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -501,7 +501,7 @@ enum remote_arch_types {RA_UNKNOWN, RA_WFWG, RA_OS2, RA_WIN95, RA_WINNT, /* * Global value meaning that the smb_uid field should be - * ingored (in share level security and protocol level == CORE) + * ignored (in share level security and protocol level == CORE) */ #define UID_FIELD_INVALID 0 diff --git a/source3/include/vfs.h b/source3/include/vfs.h index dfae16fbc24..8ada8d8aadf 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -180,7 +180,7 @@ * const struct smb_filename * * Version 35 - Change opendir from const char *, to * const struct smb_filename * - * Version 35 - Wrap aio async funtions args in a struct vfs_aio_state + * Version 35 - Wrap aio async functions args in a struct vfs_aio_state * Version 35 - Change chmod from const char *, to * const struct smb_filename * * Version 35 - Change chmod_acl from const char *, to @@ -614,7 +614,7 @@ typedef struct files_struct { * Currently Samba bases the decision whether to call POSIX open() on a * client pathname or whether to leave the low-level handle at -1, what we * call a stat-open, in the function open_file() and it is based on the - * client requested SMB acccess mask. + * client requested SMB access mask. * * The set of rights that trigger an open() include READ_CONTROL_ACCESS, * resulting in a call to open() with at least O_RDONLY. If the filesystem @@ -1209,7 +1209,7 @@ struct vfs_fn_pointers { struct files_struct *fsp, uint32_t *dosmode); - NTSTATUS (*fset_dos_attributes_fn)(struct vfs_handle_struct *hande, + NTSTATUS (*fset_dos_attributes_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, uint32_t dosmode); @@ -1351,7 +1351,7 @@ struct vfs_statvfs_struct { }; /* Add a new FSP extension of the given type. Returns a pointer to the - * extenstion data. + * extension data. */ #define VFS_ADD_FSP_EXTENSION(handle, fsp, type, destroy_fn) \ (type *)vfs_add_fsp_extension_notype(handle, (fsp), sizeof(type), (destroy_fn))