summaryrefslogtreecommitdiffstats
path: root/sesman
diff options
context:
space:
mode:
Diffstat (limited to 'sesman')
-rw-r--r--sesman/chansrv/chansrv_fuse.c6
-rw-r--r--sesman/chansrv/clipboard.c8
-rw-r--r--sesman/chansrv/devredir.c8
-rw-r--r--sesman/chansrv/devredir.h2
-rw-r--r--sesman/chansrv/drdynvc.c2
-rwxr-xr-xsesman/chansrv/pcsc/wrapper/winscard.c6
-rw-r--r--sesman/chansrv/rail.c12
-rw-r--r--sesman/chansrv/sound.c2
-rw-r--r--sesman/chansrv/xcommon.c4
-rw-r--r--sesman/config.h2
-rw-r--r--sesman/env.c2
-rw-r--r--sesman/env.h2
-rw-r--r--sesman/libscp/libscp_init.h2
-rw-r--r--sesman/libscp/libscp_lock.c4
-rw-r--r--sesman/libscp/libscp_tcp.c2
-rw-r--r--sesman/libscp/libscp_v1s.h2
-rw-r--r--sesman/libscp/libscp_v1s_mng.h2
-rw-r--r--sesman/libscp/libscp_vX.h2
-rw-r--r--sesman/sesman.c2
-rw-r--r--sesman/session.c6
-rw-r--r--sesman/sig.c2
-rw-r--r--sesman/tools/sesadmin.c4
-rw-r--r--sesman/tools/tcp.c2
23 files changed, 43 insertions, 43 deletions
diff --git a/sesman/chansrv/chansrv_fuse.c b/sesman/chansrv/chansrv_fuse.c
index ed180454..7997dfb9 100644
--- a/sesman/chansrv/chansrv_fuse.c
+++ b/sesman/chansrv/chansrv_fuse.c
@@ -19,7 +19,7 @@
/*
* TODO
* o when creating dir/file, ensure it does not already exist
- * o do not allow dirs to be created in ino==1 except for .clipbard and share mounts
+ * o do not allow dirs to be created in ino==1 except for .clipboard and share mounts
* o fix the HACK where I have to use my own buf instead of g_buffer
* this is in func xfuse_check_wait_objs()
* o if fuse mount point is already mounted, I get segfault
@@ -306,7 +306,7 @@ static void xfuse_cb_lookup(fuse_req_t req, fuse_ino_t parent,
static void xfuse_cb_getattr(fuse_req_t req, fuse_ino_t ino,
struct fuse_file_info *fi);
-/* this is not a callback, but its's used by xfuse_cb_readdir() */
+/* this is not a callback, but it's used by xfuse_cb_readdir() */
static void xfuse_dirbuf_add(fuse_req_t req, struct dirbuf *b,
const char *name, fuse_ino_t ino);
@@ -1264,7 +1264,7 @@ static struct xrdp_inode * xfuse_create_file_in_xrdp_fs(tui32 device_id,
* Check if specified file exists
*
* @param parent parent inode of file
- * @param name flilename or dirname
+ * @param name filename or dirname
*
* @return 1 if specified file exists, 0 otherwise
*****************************************************************************/
diff --git a/sesman/chansrv/clipboard.c b/sesman/chansrv/clipboard.c
index 11c37a16..929805f9 100644
--- a/sesman/chansrv/clipboard.c
+++ b/sesman/chansrv/clipboard.c
@@ -1086,11 +1086,11 @@ clipboard_process_format_announce(struct stream *s, int clip_msg_status,
/* response to CB_FORMAT_LIST; used to indicate whether
processing of the Format List PDU was successful */
static int APP_CC
-clipboard_prcoess_format_ack(struct stream *s, int clip_msg_status,
+clipboard_process_format_ack(struct stream *s, int clip_msg_status,
int clip_msg_len)
{
- log_debug("clipboard_prcoess_format_ack: CLIPRDR_FORMAT_ACK");
- log_debug("clipboard_prcoess_format_ack:");
+ log_debug("clipboard_process_format_ack: CLIPRDR_FORMAT_ACK");
+ log_debug("clipboard_process_format_ack:");
return 0;
}
@@ -1634,7 +1634,7 @@ clipboard_data_in(struct stream *s, int chan_id, int chan_flags, int length,
/* response to CB_FORMAT_LIST; used to indicate whether */
/* processing of the Format List PDU was successful */
case CB_FORMAT_LIST_RESPONSE: /* 3 CLIPRDR_FORMAT_ACK */
- rv = clipboard_prcoess_format_ack(ls, clip_msg_status,
+ rv = clipboard_process_format_ack(ls, clip_msg_status,
clip_msg_len);
break;
/* sent by recipient of CB_FORMAT_LIST; used to request data for one */
diff --git a/sesman/chansrv/devredir.c b/sesman/chansrv/devredir.c
index cea42c81..b1558463 100644
--- a/sesman/chansrv/devredir.c
+++ b/sesman/chansrv/devredir.c
@@ -242,11 +242,11 @@ dev_redir_data_in(struct stream *s, int chan_id, int chan_flags, int length,
case PAKID_CORE_CLIENT_NAME:
/* client is telling us its computer name; do we even care? */
- /* let client know loggin was successful */
+ /* let client know login was successful */
dev_redir_send_server_user_logged_on();
usleep(1000 * 100);
- /* let client know our capabilites */
+ /* let client know our capabilities */
dev_redir_send_server_core_cap_req();
/* send confirm clientID */
@@ -576,7 +576,7 @@ void dev_redir_send_drive_dir_request(IRP *irp, tui32 device_id,
******************************************************************************/
/**
- * @brief process client's repsonse to our core_capability_req() msg
+ * @brief process client's response to our core_capability_req() msg
*
* @param s stream containing client's response
*****************************************************************************/
@@ -1040,7 +1040,7 @@ dev_redir_get_dir_listing(void *fusep, tui32 device_id, char *path)
log_debug("looking for device_id=%d path=%s", device_id, path);
- /* when we get a respone to dev_redir_send_drive_create_request(), we */
+ /* when we get a response to dev_redir_send_drive_create_request(), we */
/* call dev_redir_send_drive_dir_request(), which needs the following */
/* at the end of the path argument */
if (dev_redir_string_ends_with(irp->pathname, '\\'))
diff --git a/sesman/chansrv/devredir.h b/sesman/chansrv/devredir.h
index 5a402c9c..8e2cb957 100644
--- a/sesman/chansrv/devredir.h
+++ b/sesman/chansrv/devredir.h
@@ -329,7 +329,7 @@ enum FS_INFORMATION_CLASS
(((_a) & W_FILE_ATTRIBUTE_DIRECTORY) ? S_IFDIR | 0100 : S_IFREG) |\
(((_a) & W_FILE_ATTRIBUTE_READONLY) ? 0444 : 0644)
-/* winodws time starts on Jan 1, 1601 */
+/* Windows time starts on Jan 1, 1601 */
/* Linux time starts on Jan 1, 1970 */
#define EPOCH_DIFF 11644473600LL
#define WINDOWS_TO_LINUX_TIME(_t) ((_t) / 10000000) - EPOCH_DIFF;
diff --git a/sesman/chansrv/drdynvc.c b/sesman/chansrv/drdynvc.c
index 70b08d97..5c20661e 100644
--- a/sesman/chansrv/drdynvc.c
+++ b/sesman/chansrv/drdynvc.c
@@ -414,7 +414,7 @@ drdynvc_process_data(struct stream *s, unsigned char cmd)
* process incoming data on a dynamic virtual channel
*
* @pram s stream containing the incoming data
- * @pram chand_id LK_TODO
+ * @pram chan_id LK_TODO
* @pram chan_flags LK_TODO
* @pram length LK_TODO
* @pram total_length LK_TODO
diff --git a/sesman/chansrv/pcsc/wrapper/winscard.c b/sesman/chansrv/pcsc/wrapper/winscard.c
index 34157f7c..f00ddf84 100755
--- a/sesman/chansrv/pcsc/wrapper/winscard.c
+++ b/sesman/chansrv/pcsc/wrapper/winscard.c
@@ -98,7 +98,7 @@ static int g_funcs_loaded = 0;
/*****************************************************************************/
static int __fastcall
-load_funsc(void)
+load_funcs(void)
{
HMODULE lib;
@@ -108,7 +108,7 @@ load_funsc(void)
}
g_funcs_loaded = 1;
lib = LoadLibrary("winscard-org.dll");
- LLOGLN(0, ("load_funsc: lib %p", lib));
+ LLOGLN(0, ("load_funcs: lib %p", lib));
LLOAD(aSCardEstablishContext, tSCardEstablishContext, "SCardEstablishContext");
LLOAD(aSCardReleaseContext, tSCardReleaseContext, "SCardReleaseContext");
LLOAD(aSCardIsValidContext, tSCardIsValidContext, "SCardIsValidContext");
@@ -180,7 +180,7 @@ DllEntryPoint(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
case DLL_PROCESS_ATTACH:
LLOGLN(0, ("DllEntryPoint: DLL_PROCESS_ATTACH"));
- load_funsc();
+ load_funcs();
rv = TRUE;
break;
case DLL_THREAD_ATTACH:
diff --git a/sesman/chansrv/rail.c b/sesman/chansrv/rail.c
index f12d8e3f..09f40eba 100644
--- a/sesman/chansrv/rail.c
+++ b/sesman/chansrv/rail.c
@@ -383,7 +383,7 @@ rail_startup()
if (g_xrr_event_base > 0)
{
- LOG(0, ("rail_init: found RandR entension"));
+ LOG(0, ("rail_init: found RandR extension"));
st = XRRQueryVersion(g_display, &ver_maj, &ver_min);
if (st)
{
@@ -543,12 +543,12 @@ rail_close_window(int window_id)
/*****************************************************************************/
void DEFAULT_CC
-my_timoeut(void* data)
+my_timeout(void* data)
{
- LOG(10, ("my_timoeut: g_got_focus %d", g_got_focus));
+ LOG(10, ("my_timeout: g_got_focus %d", g_got_focus));
if (g_focus_counter == (int)(long)data)
{
- LOG(10, ("my_timoeut: g_focus_counter %d", g_focus_counter));
+ LOG(10, ("my_timeout: g_focus_counter %d", g_focus_counter));
rail_win_popdown();
}
}
@@ -617,7 +617,7 @@ rail_process_activate(struct stream *s, int size)
LOG(10, (" window attributes: override_redirect %d",
window_attributes.override_redirect));
- add_timeout(200, my_timoeut, (void*)(long)g_focus_counter);
+ add_timeout(200, my_timeout, (void*)(long)g_focus_counter);
}
return 0;
}
@@ -1976,7 +1976,7 @@ rail_xevent(void *xevent)
case ReparentNotify:
LOG(10, (" got ReparentNotify window 0x%8.8x parent 0x%8.8x "
- "event 0x%8.8x x %d y %d overrider redirect %d",
+ "event 0x%8.8x x %d y %d override redirect %d",
lxevent->xreparent.window, lxevent->xreparent.parent,
lxevent->xreparent.event, lxevent->xreparent.x,
lxevent->xreparent.y, lxevent->xreparent.override_redirect));
diff --git a/sesman/chansrv/sound.c b/sesman/chansrv/sound.c
index f63cb72c..a0899f67 100644
--- a/sesman/chansrv/sound.c
+++ b/sesman/chansrv/sound.c
@@ -1001,7 +1001,7 @@ sound_check_wait_objs(void)
/******************************************************************************
** **
- ** Microphone releated code **
+ ** Microphone related code **
** **
******************************************************************************/
diff --git a/sesman/chansrv/xcommon.c b/sesman/chansrv/xcommon.c
index 919bc41b..d6d2d4b4 100644
--- a/sesman/chansrv/xcommon.c
+++ b/sesman/chansrv/xcommon.c
@@ -70,8 +70,8 @@ xcommon_fatal_handler(Display *dis)
}
/*****************************************************************************/
-/* returns time in miliseconds
- this is like g_time2 in os_calls, but not miliseconds since machine was
+/* returns time in milliseconds
+ this is like g_time2 in os_calls, but not milliseconds since machine was
up, something else
this is a time value similar to what the xserver uses */
int APP_CC
diff --git a/sesman/config.h b/sesman/config.h
index 08d84ce1..61337665 100644
--- a/sesman/config.h
+++ b/sesman/config.h
@@ -116,7 +116,7 @@ struct config_security
int ts_users;
/**
* @var ts_admins
- * @brief Terminal Server Adminnistrators group
+ * @brief Terminal Server Administrators group
*/
int ts_admins_enable;
int ts_admins;
diff --git a/sesman/env.c b/sesman/env.c
index b2f06160..39e020fd 100644
--- a/sesman/env.c
+++ b/sesman/env.c
@@ -45,7 +45,7 @@ env_check_password_file(char *filename, char *passwd)
void *des;
void *sha1;
- /* create password hash from passowrd */
+ /* create password hash from password */
passwd_bytes = g_strlen(passwd);
sha1 = ssl_sha1_info_create();
ssl_sha1_transform(sha1, "xrdp_vnc", 8);
diff --git a/sesman/env.h b/sesman/env.h
index 50473a01..378e7fd1 100644
--- a/sesman/env.h
+++ b/sesman/env.h
@@ -33,7 +33,7 @@
*
* @brief Creates vnc password file
* @param filename VNC password file name
- * @param password The password to be encrypte
+ * @param password The password to be encrypted
* @return 0 on success, 1 on error
*
*/
diff --git a/sesman/libscp/libscp_init.h b/sesman/libscp/libscp_init.h
index 20a75857..91fb4090 100644
--- a/sesman/libscp/libscp_init.h
+++ b/sesman/libscp/libscp_init.h
@@ -36,7 +36,7 @@
* @brief version neutral server accept function
* @param c connection descriptor
* @param s session descriptor pointer address.
- * it will return a newely allocated descriptor.
+ * it will return a newly allocated descriptor.
* It this memory needs to be g_free()d
*
*/
diff --git a/sesman/libscp/libscp_lock.c b/sesman/libscp/libscp_lock.c
index d35e3c9c..bd3ff771 100644
--- a/sesman/libscp/libscp_lock.c
+++ b/sesman/libscp/libscp_lock.c
@@ -94,7 +94,7 @@ scp_lock_fork_release(void)
void DEFAULT_CC
scp_lock_fork_critical_section_end(int blocking)
{
- //LOG_DBG("lock_fork_critical_secection_end()",0);
+ //LOG_DBG("lock_fork_critical_section_end()",0);
/* lock mutex */
pthread_mutex_lock(&lock_fork);
@@ -117,7 +117,7 @@ scp_lock_fork_critical_section_end(int blocking)
int DEFAULT_CC
scp_lock_fork_critical_section_start(void)
{
- //LOG_DBG("lock_fork_critical_secection_start()",0);
+ //LOG_DBG("lock_fork_critical_section_start()",0);
do
{
pthread_mutex_lock(&lock_fork);
diff --git a/sesman/libscp/libscp_tcp.c b/sesman/libscp/libscp_tcp.c
index 30e8006c..d92597f4 100644
--- a/sesman/libscp/libscp_tcp.c
+++ b/sesman/libscp/libscp_tcp.c
@@ -19,7 +19,7 @@
/**
*
* @file tcp.c
- * @brief Tcp stream funcions
+ * @brief Tcp stream functions
* @author Jay Sorg, Simone Fedele
*
*/
diff --git a/sesman/libscp/libscp_v1s.h b/sesman/libscp/libscp_v1s.h
index 5e3ec980..322edb28 100644
--- a/sesman/libscp/libscp_v1s.h
+++ b/sesman/libscp/libscp_v1s.h
@@ -38,7 +38,7 @@
* @param skipVchk if set to !0 skips the version control (to be used after
* scp_vXs_accept() )
*
- * this function places in *s the address of a newely allocated SCP_SESSION structure
+ * this function places in *s the address of a newly allocated SCP_SESSION structure
* that should be free()d
*/
enum SCP_SERVER_STATES_E
diff --git a/sesman/libscp/libscp_v1s_mng.h b/sesman/libscp/libscp_v1s_mng.h
index 72df9fa6..83dee35b 100644
--- a/sesman/libscp/libscp_v1s_mng.h
+++ b/sesman/libscp/libscp_v1s_mng.h
@@ -36,7 +36,7 @@
* @param c connection descriptor
* @param s pointer to session descriptor pointer
*
- * this function places in *s the address of a newely allocated SCP_SESSION structure
+ * this function places in *s the address of a newly allocated SCP_SESSION structure
* that should be free()d
*/
enum SCP_SERVER_STATES_E
diff --git a/sesman/libscp/libscp_vX.h b/sesman/libscp/libscp_vX.h
index a68a9ede..ef0a8290 100644
--- a/sesman/libscp/libscp_vX.h
+++ b/sesman/libscp/libscp_vX.h
@@ -38,7 +38,7 @@
* @brief version neutral server accept function
* @param c connection descriptor
* @param s session descriptor pointer address.
- * it will return a newely allocated descriptor.
+ * it will return a newly allocated descriptor.
* It this memory needs to be g_free()d
*
*/
diff --git a/sesman/sesman.c b/sesman/sesman.c
index 30fc5f7c..30ca3a79 100644
--- a/sesman/sesman.c
+++ b/sesman/sesman.c
@@ -160,7 +160,7 @@ main(int argc, char **argv)
(0 == g_strcasecmp(argv[1], "-ns"))))
{
/* starts sesman not daemonized */
- g_printf("starting sesman in foregroud...\n");
+ g_printf("starting sesman in foreground...\n");
daemon = 0;
}
else if ((2 == argc) && ((0 == g_strcasecmp(argv[1], "--help")) ||
diff --git a/sesman/session.c b/sesman/session.c
index 67c5fc6f..3860c199 100644
--- a/sesman/session.c
+++ b/sesman/session.c
@@ -348,7 +348,7 @@ session_is_display_in_chain(int display)
/******************************************************************************/
/* called with the main thread */
static int APP_CC
-session_get_aval_display_from_chain(void)
+session_get_avail_display_from_chain(void)
{
int display;
@@ -461,7 +461,7 @@ session_start_fork(int width, int height, int bpp, char *username,
return 0;
}
- display = session_get_aval_display_from_chain();
+ display = session_get_avail_display_from_chain();
if (display == 0)
{
@@ -470,7 +470,7 @@ session_start_fork(int width, int height, int bpp, char *username,
return 0;
}
- pid = g_fork(); /* parent is fork from tcp accpet,
+ pid = g_fork(); /* parent is fork from tcp accept,
child forks X and wm, then becomes scp */
if (pid == -1)
diff --git a/sesman/sig.c b/sesman/sig.c
index 5a62046a..d881515b 100644
--- a/sesman/sig.c
+++ b/sesman/sig.c
@@ -93,7 +93,7 @@ sig_sesman_reload_cfg(int sig)
/* stop logging subsystem */
log_end();
- /* replace old config with new readed one */
+ /* replace old config with newly read one */
g_cfg = cfg;
g_snprintf(cfg_file, 255, "%s/sesman.ini", XRDP_CFG_PATH);
diff --git a/sesman/tools/sesadmin.c b/sesman/tools/sesadmin.c
index 203bc023..fcf995d8 100644
--- a/sesman/tools/sesadmin.c
+++ b/sesman/tools/sesadmin.c
@@ -168,8 +168,8 @@ int main(int argc, char **argv)
void cmndHelp()
{
- fprintf(stderr, "sesadmin - a console sesman adminitration tool\n");
- fprintf(stderr, "sysntax: sesadmin [] COMMAND [OPTIONS]\n\n");
+ fprintf(stderr, "sesadmin - a console sesman administration tool\n");
+ fprintf(stderr, "syntax: sesadmin [] COMMAND [OPTIONS]\n\n");
fprintf(stderr, "-u=<username>: username to connect to sesman [MANDATORY]\n");
fprintf(stderr, "-p=<password>: password to connect to sesman [MANDATORY]\n");
fprintf(stderr, "-s=<hostname>: sesman host (default is localhost)\n");
diff --git a/sesman/tools/tcp.c b/sesman/tools/tcp.c
index 2f7ae948..32c0bbc9 100644
--- a/sesman/tools/tcp.c
+++ b/sesman/tools/tcp.c
@@ -19,7 +19,7 @@
/**
*
* @file tcp.c
- * @brief Tcp stream funcions
+ * @brief Tcp stream functions
* @author Jay Sorg, Simone Fedele
*
*/
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-05 15:49:27 +0000