mirrors
/
xrdp
mirror of https://github.com/neutrinolabs/xrdp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix typos

This commit is contained in:
a1346054 2022-09-02 23:48:01 +00:00
parent 5d0c4b4e3a
commit 7fe18cc1c0
No known key found for this signature in database
GPG Key ID: D149AD21DC40440C
40 changed files with 85 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build.yml vendored
View File

@ -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"

4
SECURITY.md
View File

@ -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.
* [xrdp-core@googlegroups.com](mailto:xrdp-core@googlegroups.com)

2
common/base64.c
View File

@ -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

14
common/log.h
View File

@ -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 ...

2
common/ms-rdpele.h
View File

@ -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 */

8
common/os_calls.c
View File

@ -2615,7 +2615,7 @@ 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();
@ -2623,7 +2623,7 @@ g_execvp(const char *p1, char *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,7 +2647,7 @@ 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();
@ -2655,7 +2655,7 @@ g_execlp3(const char *a1, const char *a2, const char *a3)
/* 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());

2
common/pixman-region.c
View File

@ -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:

4
common/string_calls.h
View File

@ -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);

2
common/trans.c
View File

@ -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;

2
common/trans.h
View File

@ -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.

2
common/xrdp_constants.h
View File

@ -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.
*

6
docs/man/sesman.ini.5.in
View File

@ -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

4
instfiles/init.d/xrdp
View File

@ -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)

2
libipm/libipm.h
View File

@ -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 */

2
libipm/libipm_send.c
View File

@ -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

4
libipm/scp.h
View File

@ -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);

2
libipm/scp_application_types.h
View File

@ -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
};

2
libxrdp/libxrdp.h
View File

@ -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;
};

12
libxrdp/xrdp_mcs.c
View File

@ -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;
}

16
libxrdp/xrdp_sec.c
View File

@ -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,

2
neutrinordp/xrdp-neutrinordp.c
View File

@ -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:

2
sesman/chansrv/chansrv_xfs.c
View File

@ -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 &&

2
sesman/chansrv/clipboard_file.c
View File

@ -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;
}

4
sesman/chansrv/devredir.c
View File

@ -211,9 +211,9 @@ const char *completion_type_to_str(enum COMPLETION_TYPE cid)
/*****************************************************************************/
/*
* Convert Windows permssions to Linux permissions.
* Convert Windows permissions to Linux permissions.
*
* We can't curently support group or other permissions as separate from the
* We can't currently support group or other permissions as separate from the
* owner (not that there's much point). We'll assume our caller will provide
* a umask if appropriate
*/

2
sesman/chansrv/irp.h
View File

@ -106,7 +106,7 @@ struct irp
};
IRP *devredir_irp_new(void);
/* As above, but allocates sufficent space for the specified
/* As above, but allocates sufficient space for the specified
* pathname, and copies it in to the pathname field */
IRP *devredir_irp_with_pathname_new(const char *pathname);
/* As above, but specifies a pathname length with pathname

2
sesman/chansrv/smartcard.c
View File

@ -799,7 +799,7 @@ scard_send_get_attrib(void *user_data, char *card, int card_bytes,
******************************************************************************/
/**
* Crate a new stream and insert specified IOCTL
* Create a new stream and insert specified IOCTL
*
* @param irp information about the I/O
* @param ioctl the IOCTL code

4
sesman/chansrv/smartcard_pcsc.c
View File

@ -342,7 +342,7 @@ context_add_card(struct pcsc_uds_client *uds_client,
if (pcscCard == 0)
{
LOG(LOG_LEVEL_ERROR,
"context_add_card: failed to allocate memmory for pcsc_card");
"context_add_card: failed to allocate memory for pcsc_card");
return 0;
}
g_autoinc++;
@ -355,7 +355,7 @@ context_add_card(struct pcsc_uds_client *uds_client,
if (acontext->cards == 0)
{
LOG(LOG_LEVEL_ERROR, "context_add_card: failed to allocate "
"memmory for uds_client->contexts->cards");
"memory for uds_client->contexts->cards");
return 0;
}
}

2
sesman/lock_uds.c
View File

@ -40,7 +40,7 @@
struct lock_uds
{
char *filename; ///<< Name of the lock file
int fd; ///<< File decriptor for open file
int fd; ///<< File descriptor for open file
int pid; ///<< PID of process originally taking out lock
};

2
sesman/sesman.c
View File

@ -823,7 +823,7 @@ main(int argc, char **argv)
}
/* Now we've forked (if necessary), we can get the prgram PID */
/* Now we've forked (if necessary), we can get the program PID */
g_pid = g_getpid();
/* signal handling */

10
sesman/sesman.ini.in
View File

@ -107,7 +107,7 @@ EnableSyslog=true
[Xorg]
; Specify the path of non-suid Xorg executable. It might differ depending
; on your distribution and version. Find out the appropreate path for your
; on your distribution and version. Find out the appropriate path for your
; environment. The typical path is known as follows:
;
; Fedora 26 or later : param=/usr/libexec/Xorg
@ -119,7 +119,7 @@ EnableSyslog=true
; FreeBSD (from 2022Q4) : param=/usr/local/libexec/Xorg
;
param=Xorg
; Leave the rest paramaters as-is unless you understand what will happen.
; Leave the rest parameters as-is unless you understand what will happen.
param=-config
param=xrdp/xorg.conf
param=-noreset
@ -143,7 +143,7 @@ param=96
#FuseMountName=/run/user/%u/thinclient_drives
#FuseMountName=/media/thinclient_drives/%U/thinclient_drives
FuseMountName=thinclient_drives
; this value allows only the user to acess their own mapped drives.
; this value allows only the user to access their own mapped drives.
; Make this more permissive (e.g. 022) if required.
FileUmask=077
; Can be used to disable FUSE functionality - see sesman.ini(5)
@ -154,8 +154,8 @@ FileUmask=077
#UseNautilus3FlistFormat=true
[ChansrvLogging]
; Note: one log file is created per display and the LogFile config value
; is ignored. The channel server log file names follow the naming convention:
; Note: one log file is created per display and the LogFile config value
; is ignored. The channel server log file names follow the naming convention:
; xrdp-chansrv.${DISPLAY}.log
;
; Note: Log levels can be any of: core, error, warning, info, debug, or trace

14
sesman/session.c
View File

@ -454,7 +454,7 @@ session_start(long data,
char **pp1 = (char **)NULL;
struct session_chain *temp = (struct session_chain *)NULL;
struct list *xserver_params = (struct list *)NULL;
char authfile[256]; /* The filename for storing xauth informations */
char authfile[256]; /* The filename for storing xauth information */
int chansrv_pid;
int display_pid;
int window_manager_pid;
@ -594,7 +594,7 @@ session_start(long data,
g_exit(0);
/*
* intermediate sesman should exit here after WM exits.
* do not execure the following codes.
* do not execute the following codes.
*/
}
#endif
@ -629,7 +629,7 @@ session_start(long data,
{
LOG(LOG_LEVEL_INFO,
"Starting user requested window manager on "
"display %d with embeded arguments using a shell: %s",
"display %d with embedded arguments using a shell: %s",
display, s->shell);
const char *argv[] = {"sh", "-c", s->shell, NULL};
g_execvp("/bin/sh", (char **)argv);
@ -688,7 +688,7 @@ session_start(long data,
"There is no X server active on display %d", display);
}
LOG(LOG_LEVEL_ERROR, "A fatal error has occured attempting to start "
LOG(LOG_LEVEL_ERROR, "A fatal error has occurred attempting to start "
"the window manager on display %d, aborting connection",
display);
g_exit(0);
@ -747,7 +747,7 @@ session_start(long data,
"Error setting the xauth cookie for display %d in file %s",
display, authfile);
LOG(LOG_LEVEL_ERROR, "A fatal error has occured attempting to start "
LOG(LOG_LEVEL_ERROR, "A fatal error has occurred attempting to start "
"the X server on display %d, aborting connection",
display);
g_exit(1);
@ -863,7 +863,7 @@ session_start(long data,
{
LOG(LOG_LEVEL_ERROR, "Unknown session type: %d",
s->type);
LOG(LOG_LEVEL_ERROR, "A fatal error has occured attempting "
LOG(LOG_LEVEL_ERROR, "A fatal error has occurred attempting "
"to start the X server on display %d, aborting connection",
display);
g_exit(1);
@ -877,7 +877,7 @@ session_start(long data,
/* should not get here */
LOG(LOG_LEVEL_ERROR,
"Error starting X server on display %d", display);
LOG(LOG_LEVEL_ERROR, "A fatal error has occured attempting "
LOG(LOG_LEVEL_ERROR, "A fatal error has occurred attempting "
"to start the X server on display %d, aborting connection",
display);

2
sesman/startwm.sh
View File

@ -42,7 +42,7 @@ pre_start()
return 0
}
# When loging out from the interactive shell, the execution sequence is:
# When logging out from the interactive shell, the execution sequence is:
#
# IF ~/.bash_logout exists THEN
# execute ~/.bash_logout

2
sesman/tools/sesrun.c
View File

@ -369,7 +369,7 @@ parse_program_args(int argc, char *argv[], struct session_params *sp,
if (argc <= optind)
{
LOG(LOG_LEVEL_ERROR, "No user name speciified");
LOG(LOG_LEVEL_ERROR, "No user name specified");
params_ok = 0;
}
else if ((argc - optind) > 1)

2
sesman/tools/tools_common.h
View File

@ -36,7 +36,7 @@ struct trans;
*
* Any other incoming messages are ignored.
*
* Following this call, the mesage can be parsed in the usual way.
* Following this call, the message can be parsed in the usual way.
*
* @param t SCP transport
* @param wait_msgno Code of the message we're waiting for.

2
tests/libipm/test_libipm_send_calls.c
View File

@ -64,7 +64,7 @@ static const unsigned char all_test_expected_buff[] =
};
/* Type used to map small test values (i.e. simple types that fit in an int)
* to expected status codes if we try to output them for a given tyoe */
* to expected status codes if we try to output them for a given type */
struct int_test_value
{
int value;

2
vnc/vnc.c
View File

@ -425,7 +425,7 @@ resize_client(struct vnc *v, int update_in_progress, int width, int height)
*
* This has some limitations. We have no way to move multiple screens about
* on a connected client, and so we are not able to change the client unless
* we're changing to a single screeen layout.
* we're changing to a single screen layout.
*/
static int
resize_client_from_layout(struct vnc *v,

6
xrdp/xrdp.c
View File

@ -144,7 +144,7 @@ g_xrdp_sync(long (*sync_func)(long param1, long param2), long sync_param1,
/*****************************************************************************/
/* Signal handler for SIGINT and SIGTERM
* Note: only signal safe code (eg. setting wait event) should be executed in
* this funciton. For more details see `man signal-safety`
* this function. For more details see `man signal-safety`
*/
static void
xrdp_shutdown(int sig)
@ -158,7 +158,7 @@ xrdp_shutdown(int sig)
/*****************************************************************************/
/* Signal handler for SIGCHLD
* Note: only signal safe code (eg. setting wait event) should be executed in
* this funciton. For more details see `man signal-safety`
* this function. For more details see `man signal-safety`
*/
static void
xrdp_child(int sig)
@ -171,7 +171,7 @@ xrdp_child(int sig)
/*****************************************************************************/
/* No-op signal handler.
* Note: only signal safe code (eg. setting wait event) should be executed in
* this funciton. For more details see `man signal-safety`
* this function. For more details see `man signal-safety`
*/
static void
xrdp_sig_no_op(int sig)

4
xrdp/xrdp_bitmap_load.c
View File

@ -607,7 +607,7 @@ xrdp_bitmap_load_bmp(struct xrdp_bitmap *self, const char *filename,
}
/* Validate the bit count for the file, read any palette, and
* dtermine the row size and row processing function */
* determine the row size and row processing function */
switch (header.bit_count)
{
case 24:
@ -749,7 +749,7 @@ log_imlib2_error(enum logLevels level, const char *filename,
msg = " No memory";
break;
case IMLIB_LOAD_ERROR_OUT_OF_FILE_DESCRIPTORS:
msg = "No file decriptors";
msg = "No file descriptors";
break;
case IMLIB_LOAD_ERROR_OUT_OF_DISK_SPACE:
msg = "No disk space";

2
xrdp/xrdp_login_wnd.c
View File

@ -737,7 +737,7 @@ xrdp_login_wnd_create(struct xrdp_wm *self)
/* Load the background image. */
/* If no file is specified no default image will be loaded. */
/* We only load the image if bpp > 8, and if the user hasn't
* disabled wallpaer in the performance settings */
* disabled wallpaper in the performance settings */
if (globals->ls_background_image[0] != 0)
{
if (self->screen->bpp <= 8)

4
xrdp/xrdp_types.h
View File

@ -706,8 +706,8 @@ struct xrdp_cfg_globals
/* transform to apply to logo */
int ls_logo_width; /* logo width (optional) */
int ls_logo_height; /* logo height (optional) */
int ls_logo_x_pos; /* logo x co-ordinate */
int ls_logo_y_pos; /* logo y co-ordinate */
int ls_logo_x_pos; /* logo x coordinate */
int ls_logo_y_pos; /* logo y coordinate */
int ls_label_x_pos; /* x pos of labels */
int ls_label_width; /* width of labels */
int ls_input_x_pos; /* x pos of text and combo boxes */