summaryrefslogtreecommitdiffstats
path: root/sesman
diff options
context:
space:
mode:
Diffstat (limited to 'sesman')
-rw-r--r--sesman/sesman.c9
-rw-r--r--sesman/session.c13
2 files changed, 12 insertions, 10 deletions
diff --git a/sesman/sesman.c b/sesman/sesman.c
index fe1f0952..88eeb346 100644
--- a/sesman/sesman.c
+++ b/sesman/sesman.c
@@ -136,7 +136,8 @@ int DEFAULT_CC
main(int argc, char **argv)
{
int fd;
- enum logReturns error;
+ enum logReturns log_error;
+ int error;
int daemon = 1;
int pid;
char pid_s[32];
@@ -267,11 +268,11 @@ main(int argc, char **argv)
g_snprintf(cfg_file, 255, "%s/sesman.ini", XRDP_CFG_PATH);
/* starting logging subsystem */
- error = log_start(cfg_file, "xrdp-sesman");
+ log_error = log_start(cfg_file, "xrdp-sesman");
- if (error != LOG_STARTUP_OK)
+ if (log_error != LOG_STARTUP_OK)
{
- switch (error)
+ switch (log_error)
{
case LOG_ERROR_MALLOC:
g_writeln("error on malloc. cannot start logging. quitting.");
diff --git a/sesman/session.c b/sesman/session.c
index 3860c199..9e29b199 100644
--- a/sesman/session.c
+++ b/sesman/session.c
@@ -504,16 +504,17 @@ session_start_fork(int width, int height, int bpp, char *username,
* Create a new session and process group since the 4.4BSD
* setlogin() affects the entire process group
*/
- if (setsid() < 0)
+ if (g_setsid() < 0)
{
- log_message(LOG_LEVEL_ERROR,
- "setsid failed - pid %d", g_getpid());
+ log_message(LOG_LEVEL_ERROR,
+ "setsid failed - pid %d", g_getpid());
}
- if (setlogin(username) < 0)
+ if (g_setlogin(username) < 0)
{
- log_message(LOG_LEVEL_ERROR,
- "setlogin failed for user %s - pid %d", username, g_getpid());
+ log_message(LOG_LEVEL_ERROR,
+ "setlogin failed for user %s - pid %d", username,
+ g_getpid());
}
}