fix typos

.github/workflows/build.yml

@@ -85,12 +85,12 @@ jobs:
     env:
       CC: ${{ matrix.CC }}
 
-      # HACK (2020-11-16): github actions dosen't support YAML anchors/aliases to
+      # HACK (2020-11-16): github actions doesn't support YAML anchors/aliases to
       # avoid repeating long config values. So instead the config values are defined
       # as environment variables using a naming convention with fields that come from
-      # the job config. These environment variables are then referenced as regualr
+      # the job config. These environment variables are then referenced as regular
       # environment variables via the naming convention in the "define env" step to
-      # define the stardard environment variable used in the rest of the steps.
+      # define the standard environment variable used in the rest of the steps.
       CONF_FLAGS_amd64_min: "--disable-ipv6 --disable-jpeg --disable-fuse --disable-mp3lame
                   --disable-fdkaac --disable-opus --disable-rfxcodec --disable-painter
                   --disable-pixman"

SECURITY.md

@@ -5,11 +5,11 @@
 
 Please DO NOT report any security issues to public GitHub issue.
 
-If you find a security vulnerability please kindly inform us about the problem immediately 
+If you find a security vulnerability please kindly inform us about the problem immediately
 so that we can fix the security problem to protect a lot of users around the world as soon
 as possible.
 
-Our email address for security report is below. This is a private mailing list and not open 
+Our email address for security report is below. This is a private mailing list and not open
 for public viewing.
 
 * [[email protected]](mailto:[email protected])

common/base64.c

@@ -32,7 +32,7 @@
  * Values for invalid and padding characters, used in the charmap
  * for converting base64 to binary
  *
- * Thse value are specially chosen to make it easy to detect padding or
+ * These values are specially chosen to make it easy to detect padding or
  * invalid characters by or-ing together the values looked up in
  * a base64 quantum */
 #define E_INVALID 0x40

common/log.h

@@ -81,7 +81,7 @@ enum logReturns
  * @brief Logging macro for messages that are for an XRDP developer to
  * understand and debug XRDP code.
  *
- * Note: all log levels are relavant to help a developer understand XRDP at
+ * Note: all log levels are relevant to help a developer understand XRDP at
  *      different levels of granularity.
  *
  * Note: the logging function calls are removed when USE_DEVEL_LOGGING is
@@ -107,7 +107,7 @@ enum logReturns
     log_message_with_location(__func__, __FILE__, __LINE__, log_level, args)
 
 /**
- * @brief Logging macro for messages that are for a systeam administrator to
+ * @brief Logging macro for messages that are for a system administrator to
  * configure and run XRDP on their machine.
  *
  * Note: the logging function calls contain additional code location info when
@@ -297,8 +297,8 @@ internal_log_is_enabled_for_level(const enum logLevels log_level,
                                   const enum logLevels override_log_level);
 
 /**
- * @param function_name, the function name (typicaly the __func__ macro)
- * @param file_name, the file name (typicaly the __FILE__ macro)
+ * @param function_name, the function name (typically the __func__ macro)
+ * @param file_name, the file name (typically the __FILE__ macro)
  * @param[out] log_level_return, the log level to use instead of the destination log level
  * @return true if the logger location overrides the destination log levels
  */
@@ -402,9 +402,9 @@ log_hexdump(const enum logLevels log_level,
  *
  * Please prefer to use the LOG and LOG_DEVEL macros instead of this function directly.
  *
- * @param function_name, the function name (typicaly the __func__ macro)
- * @param file_name, the file name (typicaly the __FILE__ macro)
- * @param line_number, the line number in the file (typicaly the __LINE__ macro)
+ * @param function_name, the function name (typically the __func__ macro)
+ * @param file_name, the file name (typically the __FILE__ macro)
+ * @param line_number, the line number in the file (typically the __LINE__ macro)
  * @param lvl, the loglevel
  * @param msg, the logtext.
  * @param ...

common/ms-rdpele.h

@@ -24,7 +24,7 @@
 
 /* LicensingMessage (MS-RDPELE 2.2.2) */
 /* TODO: to be renamed */
-#define LICENCE_TAG_DEMAND             0x01 /* LICNSE_REQUEST */
+#define LICENCE_TAG_DEMAND             0x01 /* LICENSE_REQUEST */
 #define LICENCE_TAG_AUTHREQ            0x02 /* PLATFORM_CHALLENGE */
 #define LICENCE_TAG_ISSUE              0x03 /* NEW_LICENSE */
 #define LICENCE_TAG_REISSUE            0x04 /* UPGRADE_LICENSE */

common/os_calls.c

@@ -2615,15 +2615,15 @@ g_execvp(const char *p1, char *args[])
     g_strnjoin(args_str, ARGS_STR_LEN, " ", (const char **) args, args_len);
 
     LOG(LOG_LEVEL_DEBUG,
-        "Calling exec (excutable: %s, arguments: %s)",
+        "Calling exec (executable: %s, arguments: %s)",
         p1, args_str);
 
     g_rm_temp_dir();
     rv = execvp(p1, args);
 
     /* should not get here */
     LOG(LOG_LEVEL_ERROR,
-        "Error calling exec (excutable: %s, arguments: %s) "
+        "Error calling exec (executable: %s, arguments: %s) "
         "returned errno: %d, description: %s",
         p1, args_str, g_get_errno(), g_get_strerror());
 
@@ -2647,15 +2647,15 @@ g_execlp3(const char *a1, const char *a2, const char *a3)
     g_strnjoin(args_str, ARGS_STR_LEN, " ", args, 2);
 
     LOG(LOG_LEVEL_DEBUG,
-        "Calling exec (excutable: %s, arguments: %s)",
+        "Calling exec (executable: %s, arguments: %s)",
         a1, args_str);
 
     g_rm_temp_dir();
     rv = execlp(a1, a2, a3, (void *)0);
 
     /* should not get here */
     LOG(LOG_LEVEL_ERROR,
-        "Error calling exec (excutable: %s, arguments: %s) "
+        "Error calling exec (executable: %s, arguments: %s) "
         "returned errno: %d, description: %s",
         a1, args_str, g_get_errno(), g_get_strerror());
 

common/pixman-region.c

@@ -1652,7 +1652,7 @@ quick_sort_rects (
  *
  * Side Effects:
  *      The passed-in ``region'' may be modified.
- *      overlap set to TRUE if any retangles overlapped,
+ *      overlap set to TRUE if any rectangles overlapped,
  *      else FALSE;
  *
  * Strategy:

common/string_calls.h

@@ -27,7 +27,7 @@
  * Map a character to a string value
  *
  * This structure is used by g_format_info_string() to specify the
- * string which chould be output for %'ch', where ch is a character
+ * string which could be output for %'ch', where ch is a character
  */
 struct info_string_tag
 {
@@ -132,7 +132,7 @@ g_text2bool(const char *s);
  * @param[in] src An array of strings to join. The array must be non-null.
  *      Array items may be NULL and are processed as zero length strings.
  * @param[in] src_len The number of strings to join in the src array. Must be > 0
- * @return A pointer to the begining of the joined string (ie. returns dest).
+ * @return A pointer to the beginning of the joined string (ie. returns dest).
  */
 char *
 g_strnjoin(char *dest, int dest_len, const char *joiner, const char *src[], int src_len);

common/trans.c

@@ -700,7 +700,7 @@ poll_for_async_connect(struct trans *self, int start_time, int timeout)
     while (ms_remaining > 0)
     {
         int poll_time = ms_remaining;
-        /* Lower bound for waititng for a result */
+        /* Lower bound for waiting for a result */
         if (poll_time < 100)
         {
             poll_time = 100;

common/trans.h

@@ -69,7 +69,7 @@ enum xrdp_source
  * While input is being read from a 'struct trans' and processed, the
  * cur_source member is set to the my_source member from the transport.
  * During this processing, trans_write_copy() may be called to send output
- * on another struct trans. If this happens, and the ouput needs to be
+ * on another struct trans. If this happens, and the output needs to be
  * buffered, trans_write_copy() can add the number of bytes generated by
  * the input trans to the source field for the cur_source. This allows us to
  * see how much output has been buffered for each input source.

common/xrdp_constants.h

@@ -29,7 +29,7 @@
  *
  * xrdp constants
  *
- * Constants defined in publically available Microsoft documents are not
+ * Constants defined in publicly available Microsoft documents are not
  * stored here, but are stored in the include files ms-*.h, where the name
  * of the file is the name of the document defining the constant.
  *

docs/man/sesman.ini.5.in

@@ -56,7 +56,7 @@ UNIX domain socket for xrdp-sesman(8) to listen on.
 .RS
 The default value of this setting is 'sesman.socket'.
 .PP
-An absoute path can be specified by starting this parameter with a '/'.
+An absolute path can be specified by starting this parameter with a '/'.
 In this instance, the system administrator is responsible for ensuring
 the socket can only be created by a suitably privileged process.
 .PP
@@ -334,8 +334,8 @@ drive. To fix this, consult the docs for your chosen desktop.
 \fBFileUmask\fR=\fImode\fR
 Additional umask to apply to files in the \fBFuseMountName\fR directory.
 The default value of 077 prevents other users on the system from reading
-files on your redirected drives. This may not be approprate for all
-environents, and so you can change this value to allow other users to
+files on your redirected drives. This may not be appropriate for all
+environments, and so you can change this value to allow other users to
 access your remote files if required.
 
 .TP

instfiles/init.d/xrdp

@@ -90,11 +90,11 @@ case "$1" in
             value=$?
             [ $value -gt 0 ] && exitval=$value
         fi
-        # Make pidfile readables for all users (for status to work)
+        # Make pidfile readable for all users (for status to work)
         [ -e $PIDDIR/xrdp-sesman.pid ] && chmod 0644 $PIDDIR/xrdp-sesman.pid
         [ -e $PIDDIR/$NAME.pid ] && chmod 0644 $PIDDIR/$NAME.pid
         # Note: Unfortunately, xrdp currently takes too long to create
-        # the pidffile unless properly patched
+        # the pidfile unless properly patched
         log_end_msg $exitval
 	;;
   stop)

libipm/libipm.h

@@ -62,7 +62,7 @@ enum libipm_status
 {
     E_LI_SUCCESS = 0,
     E_LI_PROGRAM_ERROR, /***< Programming error */
-    E_LI_NO_MEMORY, /***< Memory allocaton failure */
+    E_LI_NO_MEMORY, /***< Memory allocation failure */
     E_LI_UNSUPPORTED_TYPE, /***< Specified type code is unsupported */
     E_LI_UNIMPLEMENTED_TYPE, /***< Specified type code is unimplemented */
     E_LI_UNEXPECTED_TYPE, /***< Encountered unexpected type on input */

libipm/libipm_send.c

@@ -423,7 +423,7 @@ libipm_msg_out_appendv(struct trans *trans, const char *format, va_list *argptr)
 }
 
 /**************************************************************************//**
- * Prepare the tranport to build an output message
+ * Prepare the transport to build an output message
  * @param trans libipm trans
  * @param msgno Number of message
  * @return != 0 for error

libipm/scp.h

@@ -101,7 +101,7 @@ scp_port_to_display_string(const char *port, char *buff, unsigned int bufflen);
  *         termination, or NULL for none.
  * @return Initialised SCP transport
  *
- * The returned tranport has the is_term member set to term_func.
+ * The returned transport has the is_term member set to term_func.
  */
 struct trans *
 scp_connect(const  char *port,
@@ -113,7 +113,7 @@ scp_connect(const  char *port,
  * @param trans connected endpoint
  * @return != 0 for error
  *
- * The returned tranport has the is_term member set to term_func.
+ * The returned transport has the is_term member set to term_func.
  */
 int
 scp_init_trans(struct trans *trans);

libipm/scp_application_types.h

@@ -56,7 +56,7 @@ struct scp_session_info
     unsigned short width; ///< Initial session width
     unsigned short height; ///< Initial session height
     unsigned char bpp;  ///< Session bits-per-pixel
-    time_t start_time;  ///< When sesion was created
+    time_t start_time;  ///< When session was created
     char *username;     ///< Username for session
     char *start_ip_addr; ///< IP address of starting client
 };

libxrdp/libxrdp.h

@@ -67,7 +67,7 @@ struct xrdp_mcs
     struct stream *client_mcs_data;
     struct stream *server_mcs_data;
     struct list *channel_list;
-    /* This boolean is set to indicate we're expecing channel join
+    /* This boolean is set to indicate we're expecting channel join
      * requests as part of the connect sequence */
     int expecting_channel_join_requests;
 };

libxrdp/xrdp_mcs.c

@@ -190,7 +190,7 @@ xrdp_mcs_recv(struct xrdp_mcs *self, struct stream *s, int *chan)
     {
         LOG_DEVEL(LOG_LEVEL_TRACE,
                   "Received [ITU-T T.125] DisconnectProviderUltimatum");
-        LOG(LOG_LEVEL_DEBUG, "Recieved disconnection request");
+        LOG(LOG_LEVEL_DEBUG, "Received disconnection request");
         return 1;
     }
 
@@ -971,7 +971,7 @@ xrdp_mcs_out_gcc_data(struct xrdp_sec *self)
               SEC_TAG_SRV_INFO,
               self->mcs_layer->iso_layer->rdpNegData ? 12 : 8);
     LOG_DEVEL(LOG_LEVEL_TRACE, "Adding struct [MS-RDPBCGR] TS_UD_SC_CORE "
-              "<Requiered fields> version 0x%8.8x", 0x00080004);
+              "<Required fields> version 0x%8.8x", 0x00080004);
     if (self->mcs_layer->iso_layer->rdpNegData)
     {
         /* RequestedProtocol */
@@ -1315,17 +1315,17 @@ xrdp_mcs_incoming(struct xrdp_mcs *self)
         return 1;
     }
 
-    LOG(LOG_LEVEL_DEBUG, "[MCS Connection Sequence] construct connection reponse");
+    LOG(LOG_LEVEL_DEBUG, "[MCS Connection Sequence] construct connection response");
     if (xrdp_mcs_out_gcc_data(self->sec_layer) != 0)
     {
-        LOG(LOG_LEVEL_ERROR, "[MCS Connection Sequence] construct connection reponse failed");
+        LOG(LOG_LEVEL_ERROR, "[MCS Connection Sequence] construct connection response failed");
         return 1;
     }
 
-    LOG(LOG_LEVEL_DEBUG, "[MCS Connection Sequence] send connection reponse");
+    LOG(LOG_LEVEL_DEBUG, "[MCS Connection Sequence] send connection response");
     if (xrdp_mcs_send_connect_response(self) != 0)
     {
-        LOG(LOG_LEVEL_ERROR, "[MCS Connection Sequence] send connection reponse failed");
+        LOG(LOG_LEVEL_ERROR, "[MCS Connection Sequence] send connection response failed");
         return 1;
     }
 

libxrdp/xrdp_sec.c

@@ -1012,7 +1012,7 @@ xrdp_sec_process_logon_info(struct xrdp_sec *self, struct stream *s)
              && len_password == 0
              && (sep = g_strchr(self->rdp_layer->client_info.username, '\x1f')) != NULL)
     {
-        LOG(LOG_LEVEL_DEBUG, "Client supplied a Logon token. Overwritting password with logon token.");
+        LOG(LOG_LEVEL_DEBUG, "Client supplied a Logon token. Overwriting password with logon token.");
         g_strncpy(self->rdp_layer->client_info.password, sep + 1,
                   sizeof(self->rdp_layer->client_info.password) - 1);
         self->rdp_layer->client_info.username[sep - self->rdp_layer->client_info.username] = '\0';
@@ -1036,7 +1036,7 @@ xrdp_sec_process_logon_info(struct xrdp_sec *self, struct stream *s)
     if (self->rdp_layer->client_info.domain_user_separator[0] != '\0'
             && self->rdp_layer->client_info.domain[0] != '\0')
     {
-        LOG(LOG_LEVEL_DEBUG, "Client supplied domain with user name. Overwritting user name with user name parsed from domain.");
+        LOG(LOG_LEVEL_DEBUG, "Client supplied domain with user name. Overwriting user name with user name parsed from domain.");
         int size = sizeof(self->rdp_layer->client_info.username);
         g_strncat(self->rdp_layer->client_info.username, self->rdp_layer->client_info.domain_user_separator, size - 1 - g_strlen(self->rdp_layer->client_info.domain_user_separator));
         g_strncat(self->rdp_layer->client_info.username, self->rdp_layer->client_info.domain, size - 1 - g_strlen(self->rdp_layer->client_info.domain));
@@ -1079,7 +1079,7 @@ xrdp_sec_process_logon_info(struct xrdp_sec *self, struct stream *s)
         {
             return 1;
         }
-        /* TS_EXTENDED_INFO_PACKET requiered fields */
+        /* TS_EXTENDED_INFO_PACKET required fields */
         in_uint8s(s, 2);         /* clientAddressFamily */
         in_uint16_le(s, len_ip);
         if (unicode_utf16_in(s, len_ip - 2, tmpdata, sizeof(tmpdata) - 1) != 0)
@@ -1098,7 +1098,7 @@ xrdp_sec_process_logon_info(struct xrdp_sec *self, struct stream *s)
             return 1;
         }
         LOG_DEVEL(LOG_LEVEL_TRACE, "Received [MS-RDPBCGR] TS_EXTENDED_INFO_PACKET "
-                  "<Requiered Fields> clientAddressFamily (ignored), "
+                  "<Required Fields> clientAddressFamily (ignored), "
                   "cbClientAddress (ignored), clientAddress (ignored), "
                   "cbClientDir (ignored), clientDir (ignored)");
 
@@ -1983,7 +1983,7 @@ xrdp_sec_process_mcs_data_CS_CORE(struct xrdp_sec *self, struct stream *s)
     in_uint8s(s, 64); /* imeFileName */
     LOG_DEVEL(LOG_LEVEL_TRACE, "Received [MS-RDPBCGR] TS_UD_CS_CORE "
               "<Required fields> version %08x, desktopWidth %d, "
-              "desktopHeight %d, colorDepth %s, SASSequence (ingored), "
+              "desktopHeight %d, colorDepth %s, SASSequence (ignored), "
               "keyboardLayout (ignored), clientBuild (ignored), "
               "clientName %s, keyboardType (ignored), "
               "keyboardSubType (ignored), keyboardFunctionKey (ignored), "
@@ -2668,12 +2668,12 @@ xrdp_sec_in_mcs_data(struct xrdp_sec *self)
     in_uint32_le(s, client_info->keyboard_type); /* [MS-RDPBCGR] TS_UD_CS_CORE keyboardType */
     in_uint32_le(s, client_info->keyboard_subtype); /* [MS-RDPBCGR] TS_UD_CS_CORE keyboardSubType */
     LOG_DEVEL(LOG_LEVEL_TRACE, "Received [MS-RDPBCGR] TS_UD_CS_CORE "
-              "<Requiered fields> version (ignored), desktopWidth (ignored), "
-              "desktopHeight (ignored), colorDepth (ignored), SASSequence (ingored), "
+              "<Required fields> version (ignored), desktopWidth (ignored), "
+              "desktopHeight (ignored), colorDepth (ignored), SASSequence (ignored), "
               "keyboardLayout 0x%8.8x, clientBuild %d, "
               "clientName %s, keyboardType 0x%8.8x, "
               "keyboardSubType 0x%8.8x, keyboardFunctionKey (ignored), "
-              "imeFileName (ignroed)",
+              "imeFileName (ignored)",
               client_info->keylayout,
               client_info->build,
               client_info->hostname,

neutrinordp/xrdp-neutrinordp.c

@@ -244,7 +244,7 @@ lxrdp_connect(struct mod *mod)
                         break;
 
                     case INSUFFICIENTPRIVILEGESERROR:
-                        g_snprintf(buf, 128, "Insufficent privileges on target server");
+                        g_snprintf(buf, 128, "Insufficient privileges on target server");
                         break;
 
                     default:

sesman/chansrv/chansrv_xfs.c

@@ -662,7 +662,7 @@ xfs_readdir(struct xfs_fs *xfs, struct xfs_dir_handle *handle, off_t *off)
     XFS_INODE_ALL *dxino = NULL;
     XFS_INODE_ALL *xino = NULL;
 
-    /* Check the direcory is still valid */
+    /* Check the directory is still valid */
     if (handle->inum < xfs->inode_count &&
             ((dxino = xfs->inode_table[handle->inum]) != NULL) &&
             (dxino->pub.mode & S_IFDIR) != 0 &&

sesman/chansrv/clipboard_file.c

@@ -503,7 +503,7 @@ clipboard_send_file_data(int streamId, int lindex,
     g_file_close(fd);
 
     /* Log who transferred which file via clipboard for the purpose of audit */
-    LOG(LOG_LEVEL_INFO, "S2C: Transfered a file: filename=%s, uid=%d", full_fn, g_getuid());
+    LOG(LOG_LEVEL_INFO, "S2C: Transferred a file: filename=%s, uid=%d", full_fn, g_getuid());
 
     return rv;
 }