diff options
Diffstat (limited to 'sesman/config.c')
-rw-r--r-- | sesman/config.c | 558 |
1 files changed, 290 insertions, 268 deletions
diff --git a/sesman/config.c b/sesman/config.c index a4342676..9938249f 100644 --- a/sesman/config.c +++ b/sesman/config.c @@ -1,21 +1,20 @@ -/* - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - xrdp: A Remote Desktop Protocol server. - Copyright (C) Jay Sorg 2005-2010 -*/ +/** + * xrdp: A Remote Desktop Protocol server. + * + * Copyright (C) Jay Sorg 2004-2012 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ /** * @@ -31,146 +30,153 @@ #include "sesman.h" #include "log.h" -extern struct config_sesman* g_cfg; /* in sesman.c */ +extern struct config_sesman *g_cfg; /* in sesman.c */ /******************************************************************************/ int DEFAULT_CC -config_read(struct config_sesman* cfg) +config_read(struct config_sesman *cfg) { - int fd; - struct list* sec; - struct list* param_n; - struct list* param_v; - char cfg_file[256]; - - g_snprintf(cfg_file, 255, "%s/sesman.ini", XRDP_CFG_PATH); - fd = g_file_open(cfg_file); - if (-1 == fd) - { - //if (g_cfg->log.fd >= 0) - //{ - /* logging is already active */ - log_message(LOG_LEVEL_ALWAYS, "error opening %s in \ + int fd; + struct list *sec; + struct list *param_n; + struct list *param_v; + char cfg_file[256]; + + g_snprintf(cfg_file, 255, "%s/sesman.ini", XRDP_CFG_PATH); + fd = g_file_open(cfg_file); + + if (-1 == fd) + { + //if (g_cfg->log.fd >= 0) + //{ + /* logging is already active */ + log_message(LOG_LEVEL_ALWAYS, "error opening %s in \ config_read", cfg_file); - //} - //else - //{ - g_printf("error opening %s in config_read", cfg_file); - //} - return 1; - } - g_memset(cfg, 0, sizeof(struct config_sesman)); - sec = list_create(); - sec->auto_free = 1; - file_read_sections(fd, sec); - param_n = list_create(); - param_n->auto_free = 1; - param_v = list_create(); - param_v->auto_free = 1; - - /* read global config */ - config_read_globals(fd, cfg, param_n, param_v); - - /* read Xvnc/X11rdp parameter list */ - config_read_vnc_params(fd, cfg, param_n, param_v); - config_read_rdp_params(fd, cfg, param_n, param_v); - - /* read logging config */ - // config_read_logging(fd, &(cfg->log), param_n, param_v); - - /* read security config */ - config_read_security(fd, &(cfg->sec), param_n, param_v); - - /* read session config */ - config_read_sessions(fd, &(cfg->sess), param_n, param_v); - - /* cleanup */ - list_delete(sec); - list_delete(param_v); - list_delete(param_n); - g_file_close(fd); - return 0; + //} + //else + //{ + g_printf("error opening %s in config_read", cfg_file); + //} + return 1; + } + + g_memset(cfg, 0, sizeof(struct config_sesman)); + sec = list_create(); + sec->auto_free = 1; + file_read_sections(fd, sec); + param_n = list_create(); + param_n->auto_free = 1; + param_v = list_create(); + param_v->auto_free = 1; + + /* read global config */ + config_read_globals(fd, cfg, param_n, param_v); + + /* read Xvnc/X11rdp parameter list */ + config_read_vnc_params(fd, cfg, param_n, param_v); + config_read_rdp_params(fd, cfg, param_n, param_v); + + /* read logging config */ + // config_read_logging(fd, &(cfg->log), param_n, param_v); + + /* read security config */ + config_read_security(fd, &(cfg->sec), param_n, param_v); + + /* read session config */ + config_read_sessions(fd, &(cfg->sess), param_n, param_v); + + /* cleanup */ + list_delete(sec); + list_delete(param_v); + list_delete(param_n); + g_file_close(fd); + return 0; } /******************************************************************************/ int DEFAULT_CC -config_read_globals(int file, struct config_sesman* cf, struct list* param_n, - struct list* param_v) +config_read_globals(int file, struct config_sesman *cf, struct list *param_n, + struct list *param_v) { - int i; - char* buf; + int i; + char *buf; - list_clear(param_v); - list_clear(param_n); + list_clear(param_v); + list_clear(param_n); - /* resetting the struct */ - cf->listen_address[0] = '\0'; - cf->listen_port[0] = '\0'; - cf->enable_user_wm = 0; - cf->user_wm[0] = '\0'; - cf->default_wm[0] = '\0'; - cf->auth_file_path = 0; + /* resetting the struct */ + cf->listen_address[0] = '\0'; + cf->listen_port[0] = '\0'; + cf->enable_user_wm = 0; + cf->user_wm[0] = '\0'; + cf->default_wm[0] = '\0'; + cf->auth_file_path = 0; - file_read_section(file, SESMAN_CFG_GLOBALS, param_n, param_v); - for (i = 0; i < param_n->count; i++) - { - buf = (char*)list_get_item(param_n, i); - if (0 == g_strcasecmp(buf, SESMAN_CFG_DEFWM)) - { - g_strncpy(cf->default_wm, (char*)list_get_item(param_v, i), 31); - } - else if (0 == g_strcasecmp(buf, SESMAN_CFG_USERWM)) + file_read_section(file, SESMAN_CFG_GLOBALS, param_n, param_v); + + for (i = 0; i < param_n->count; i++) { - g_strncpy(cf->user_wm, (char*)list_get_item(param_v, i), 31); + buf = (char *)list_get_item(param_n, i); + + if (0 == g_strcasecmp(buf, SESMAN_CFG_DEFWM)) + { + g_strncpy(cf->default_wm, (char *)list_get_item(param_v, i), 31); + } + else if (0 == g_strcasecmp(buf, SESMAN_CFG_USERWM)) + { + g_strncpy(cf->user_wm, (char *)list_get_item(param_v, i), 31); + } + else if (0 == g_strcasecmp(buf, SESMAN_CFG_ENABLE_USERWM)) + { + cf->enable_user_wm = text2bool((char *)list_get_item(param_v, i)); + } + else if (0 == g_strcasecmp(buf, SESMAN_CFG_PORT)) + { + g_strncpy(cf->listen_port, (char *)list_get_item(param_v, i), 15); + } + else if (0 == g_strcasecmp(buf, SESMAN_CFG_ADDRESS)) + { + g_strncpy(cf->listen_address, (char *)list_get_item(param_v, i), 31); + } + else if (0 == g_strcasecmp(buf, SESMAN_CFG_AUTH_FILE_PATH)) + { + cf->auth_file_path = g_strdup((char *)list_get_item(param_v, i)); + } } - else if (0 == g_strcasecmp(buf, SESMAN_CFG_ENABLE_USERWM)) + + /* checking for missing required parameters */ + if ('\0' == cf->listen_address[0]) { - cf->enable_user_wm = text2bool((char*)list_get_item(param_v, i)); + g_strncpy(cf->listen_address, "0.0.0.0", 8); } - else if (0 == g_strcasecmp(buf, SESMAN_CFG_PORT)) + + if ('\0' == cf->listen_port[0]) { - g_strncpy(cf->listen_port, (char*)list_get_item(param_v, i), 15); + g_strncpy(cf->listen_port, "3350", 5); } - else if (0 == g_strcasecmp(buf, SESMAN_CFG_ADDRESS)) + + if ('\0' == cf->user_wm[0]) { - g_strncpy(cf->listen_address, (char*)list_get_item(param_v, i), 31); + cf->enable_user_wm = 0; } - else if (0 == g_strcasecmp(buf, SESMAN_CFG_AUTH_FILE_PATH)) + + if ('\0' == cf->default_wm[0]) { - cf->auth_file_path = g_strdup((char*)list_get_item(param_v, i)); + g_strncpy(cf->default_wm, "startwm.sh", 11); } - } - /* checking for missing required parameters */ - if ('\0' == cf->listen_address[0]) - { - g_strncpy(cf->listen_address, "0.0.0.0", 8); - } - if ('\0' == cf->listen_port[0]) - { - g_strncpy(cf->listen_port, "3350", 5); - } - if ('\0' == cf->user_wm[0]) - { - cf->enable_user_wm = 0; - } - if ('\0' == cf->default_wm[0]) - { - g_strncpy(cf->default_wm, "startwm.sh", 11); - } - - /* showing read config */ - g_printf("sesman config:\r\n"); - g_printf("\tListenAddress: %s\r\n", cf->listen_address); - g_printf("\tListenPort: %s\r\n", cf->listen_port); - g_printf("\tEnableUserWindowManager: %i\r\n", cf->enable_user_wm); - g_printf("\tUserWindowManager: %s\r\n", cf->user_wm); - g_printf("\tDefaultWindowManager: %s\r\n", cf->default_wm); - g_printf("\tAuthFilePath: %s\r\n", ((cf->auth_file_path) ? (cf->auth_file_path) : ("disabled"))); + /* showing read config */ + g_printf("sesman config:\r\n"); + g_printf("\tListenAddress: %s\r\n", cf->listen_address); + g_printf("\tListenPort: %s\r\n", cf->listen_port); + g_printf("\tEnableUserWindowManager: %i\r\n", cf->enable_user_wm); + g_printf("\tUserWindowManager: %s\r\n", cf->user_wm); + g_printf("\tDefaultWindowManager: %s\r\n", cf->default_wm); + g_printf("\tAuthFilePath: %s\r\n", ((cf->auth_file_path) ? (cf->auth_file_path) : ("disabled"))); - return 0; + return 0; } /****************************************************************************** @@ -184,7 +190,7 @@ config_read_logging(int file, struct log_config* lc, struct list* param_n, list_clear(param_v); list_clear(param_n); - // setting defaults + // setting defaults lc->program_name = g_strdup("sesman"); lc->log_file = 0; lc->fd = 0; @@ -230,185 +236,201 @@ config_read_logging(int file, struct log_config* lc, struct list* param_n, */ /******************************************************************************/ int DEFAULT_CC -config_read_security(int file, struct config_security* sc, - struct list* param_n, - struct list* param_v) +config_read_security(int file, struct config_security *sc, + struct list *param_n, + struct list *param_v) { - int i; - int gid; - char* buf; + int i; + int gid; + char *buf; - list_clear(param_v); - list_clear(param_n); + list_clear(param_v); + list_clear(param_n); - /* setting defaults */ - sc->allow_root = 0; - sc->login_retry = 3; - sc->ts_users_enable = 0; - sc->ts_admins_enable = 0; + /* setting defaults */ + sc->allow_root = 0; + sc->login_retry = 3; + sc->ts_users_enable = 0; + sc->ts_admins_enable = 0; - file_read_section(file, SESMAN_CFG_SECURITY, param_n, param_v); - for (i = 0; i < param_n->count; i++) - { - buf = (char*)list_get_item(param_n, i); - if (0 == g_strcasecmp(buf, SESMAN_CFG_SEC_ALLOW_ROOT)) + file_read_section(file, SESMAN_CFG_SECURITY, param_n, param_v); + + for (i = 0; i < param_n->count; i++) { - sc->allow_root = text2bool((char*)list_get_item(param_v, i)); + buf = (char *)list_get_item(param_n, i); + + if (0 == g_strcasecmp(buf, SESMAN_CFG_SEC_ALLOW_ROOT)) + { + sc->allow_root = text2bool((char *)list_get_item(param_v, i)); + } + + if (0 == g_strcasecmp(buf, SESMAN_CFG_SEC_LOGIN_RETRY)) + { + sc->login_retry = g_atoi((char *)list_get_item(param_v, i)); + } + + if (0 == g_strcasecmp(buf, SESMAN_CFG_SEC_USR_GROUP)) + { + if (g_getgroup_info((char *)list_get_item(param_v, i), &gid) == 0) + { + sc->ts_users_enable = 1; + sc->ts_users = gid; + } + } + + if (0 == g_strcasecmp(buf, SESMAN_CFG_SEC_ADM_GROUP)) + { + if (g_getgroup_info((char *)list_get_item(param_v, i), &gid) == 0) + { + sc->ts_admins_enable = 1; + sc->ts_admins = gid; + } + } } - if (0 == g_strcasecmp(buf, SESMAN_CFG_SEC_LOGIN_RETRY)) + + /* printing security config */ + g_printf("security configuration:\r\n"); + g_printf("\tAllowRootLogin: %i\r\n", sc->allow_root); + g_printf("\tMaxLoginRetry: %i\r\n", sc->login_retry); + + if (sc->ts_users_enable) { - sc->login_retry = g_atoi((char*)list_get_item(param_v, i)); + g_printf("\tTSUsersGroup: %i\r\n", sc->ts_users); } - if (0 == g_strcasecmp(buf, SESMAN_CFG_SEC_USR_GROUP)) + else { - if (g_getgroup_info((char*)list_get_item(param_v, i), &gid) == 0) - { - sc->ts_users_enable = 1; - sc->ts_users = gid; - } + g_printf("\tNo TSUsersGroup defined\r\n"); } - if (0 == g_strcasecmp(buf, SESMAN_CFG_SEC_ADM_GROUP)) + + if (sc->ts_admins_enable) { - if (g_getgroup_info((char*)list_get_item(param_v, i), &gid) == 0) - { - sc->ts_admins_enable = 1; - sc->ts_admins = gid; - } + g_printf("\tTSAdminsGroup: %i\r\n", sc->ts_admins); + } + else + { + g_printf("\tNo TSAdminsGroup defined\r\n"); } - } - - /* printing security config */ - g_printf("security configuration:\r\n"); - g_printf("\tAllowRootLogin: %i\r\n",sc->allow_root); - g_printf("\tMaxLoginRetry: %i\r\n",sc->login_retry); - if (sc->ts_users_enable) - { - g_printf("\tTSUsersGroup: %i\r\n", sc->ts_users); - } - else - { - g_printf("\tNo TSUsersGroup defined\r\n"); - } - if (sc->ts_admins_enable) - { - g_printf("\tTSAdminsGroup: %i\r\n", sc->ts_admins); - } - else - { - g_printf("\tNo TSAdminsGroup defined\r\n"); - } - return 0; + return 0; } /******************************************************************************/ int DEFAULT_CC -config_read_sessions(int file, struct config_sessions* se, struct list* param_n, - struct list* param_v) +config_read_sessions(int file, struct config_sessions *se, struct list *param_n, + struct list *param_v) { - int i; - char* buf; + int i; + char *buf; - list_clear(param_v); - list_clear(param_n); + list_clear(param_v); + list_clear(param_n); - /* setting defaults */ - se->x11_display_offset=10; - se->max_sessions=0; - se->max_idle_time=0; - se->max_disc_time=0; - se->kill_disconnected=0; + /* setting defaults */ + se->x11_display_offset = 10; + se->max_sessions = 0; + se->max_idle_time = 0; + se->max_disc_time = 0; + se->kill_disconnected = 0; - file_read_section(file, SESMAN_CFG_SESSIONS, param_n, param_v); - for (i = 0; i < param_n->count; i++) - { - buf = (char*)list_get_item(param_n, i); - if (0 == g_strcasecmp(buf, SESMAN_CFG_X11DISPLAYOFFSET)) - { - se->x11_display_offset = g_atoi((char*)list_get_item(param_v, i)); - } - if (0 == g_strcasecmp(buf, SESMAN_CFG_SESS_MAX)) - { - se->max_sessions = g_atoi((char*)list_get_item(param_v, i)); - } - if (0 == g_strcasecmp(buf, SESMAN_CFG_SESS_KILL_DISC)) - { - se->kill_disconnected = text2bool((char*)list_get_item(param_v, i)); - } - if (0 == g_strcasecmp(buf, SESMAN_CFG_SESS_IDLE_LIMIT)) - { - se->max_idle_time=g_atoi((char*)list_get_item(param_v, i)); - } - if (0 == g_strcasecmp(buf, SESMAN_CFG_SESS_DISC_LIMIT)) + file_read_section(file, SESMAN_CFG_SESSIONS, param_n, param_v); + + for (i = 0; i < param_n->count; i++) { - se->max_disc_time=g_atoi((char*)list_get_item(param_v, i)); + buf = (char *)list_get_item(param_n, i); + + if (0 == g_strcasecmp(buf, SESMAN_CFG_X11DISPLAYOFFSET)) + { + se->x11_display_offset = g_atoi((char *)list_get_item(param_v, i)); + } + + if (0 == g_strcasecmp(buf, SESMAN_CFG_SESS_MAX)) + { + se->max_sessions = g_atoi((char *)list_get_item(param_v, i)); + } + + if (0 == g_strcasecmp(buf, SESMAN_CFG_SESS_KILL_DISC)) + { + se->kill_disconnected = text2bool((char *)list_get_item(param_v, i)); + } + + if (0 == g_strcasecmp(buf, SESMAN_CFG_SESS_IDLE_LIMIT)) + { + se->max_idle_time = g_atoi((char *)list_get_item(param_v, i)); + } + + if (0 == g_strcasecmp(buf, SESMAN_CFG_SESS_DISC_LIMIT)) + { + se->max_disc_time = g_atoi((char *)list_get_item(param_v, i)); + } } - } - /* printing security config */ - g_printf("session configuration:\r\n"); - g_printf("\tMaxSessions: %i\r\n", se->max_sessions); - g_printf("\tX11DisplayOffset: %i\r\n", se->x11_display_offset); - g_printf("\tKillDisconnected: %i\r\n", se->kill_disconnected); - g_printf("\tIdleTimeLimit: %i\r\n", se->max_idle_time); - g_printf("\tDisconnectedTimeLimit: %i\r\n", se->max_idle_time); + /* printing security config */ + g_printf("session configuration:\r\n"); + g_printf("\tMaxSessions: %i\r\n", se->max_sessions); + g_printf("\tX11DisplayOffset: %i\r\n", se->x11_display_offset); + g_printf("\tKillDisconnected: %i\r\n", se->kill_disconnected); + g_printf("\tIdleTimeLimit: %i\r\n", se->max_idle_time); + g_printf("\tDisconnectedTimeLimit: %i\r\n", se->max_idle_time); - return 0; + return 0; } /******************************************************************************/ int DEFAULT_CC -config_read_rdp_params(int file, struct config_sesman* cs, struct list* param_n, - struct list* param_v) +config_read_rdp_params(int file, struct config_sesman *cs, struct list *param_n, + struct list *param_v) { - int i; + int i; - list_clear(param_v); - list_clear(param_n); + list_clear(param_v); + list_clear(param_n); - cs->rdp_params=list_create(); + cs->rdp_params = list_create(); - file_read_section(file, SESMAN_CFG_RDP_PARAMS, param_n, param_v); - for (i = 0; i < param_n->count; i++) - { - list_add_item(cs->rdp_params, (long)g_strdup((char*)list_get_item(param_v, i))); - } + file_read_section(file, SESMAN_CFG_RDP_PARAMS, param_n, param_v); - /* printing security config */ - g_printf("X11rdp parameters:\r\n"); - for (i = 0; i < cs->rdp_params->count; i++) - { - g_printf("\tParameter %02d %s\r\n", i, (char*)list_get_item(cs->rdp_params, i)); - } + for (i = 0; i < param_n->count; i++) + { + list_add_item(cs->rdp_params, (long)g_strdup((char *)list_get_item(param_v, i))); + } - return 0; + /* printing security config */ + g_printf("X11rdp parameters:\r\n"); + + for (i = 0; i < cs->rdp_params->count; i++) + { + g_printf("\tParameter %02d %s\r\n", i, (char *)list_get_item(cs->rdp_params, i)); + } + + return 0; } /******************************************************************************/ int DEFAULT_CC -config_read_vnc_params(int file, struct config_sesman* cs, struct list* param_n, - struct list* param_v) +config_read_vnc_params(int file, struct config_sesman *cs, struct list *param_n, + struct list *param_v) { - int i; + int i; - list_clear(param_v); - list_clear(param_n); + list_clear(param_v); + list_clear(param_n); - cs->vnc_params=list_create(); + cs->vnc_params = list_create(); - file_read_section(file, SESMAN_CFG_VNC_PARAMS, param_n, param_v); - for (i = 0; i < param_n->count; i++) - { - list_add_item(cs->vnc_params, (long)g_strdup((char*)list_get_item(param_v, i))); - } + file_read_section(file, SESMAN_CFG_VNC_PARAMS, param_n, param_v); - /* printing security config */ - g_printf("Xvnc parameters:\r\n"); - for (i = 0; i < cs->vnc_params->count; i++) - { - g_printf("\tParameter %02d %s\r\n", i, (char*)list_get_item(cs->vnc_params, i)); - } + for (i = 0; i < param_n->count; i++) + { + list_add_item(cs->vnc_params, (long)g_strdup((char *)list_get_item(param_v, i))); + } - return 0; -} + /* printing security config */ + g_printf("Xvnc parameters:\r\n"); + for (i = 0; i < cs->vnc_params->count; i++) + { + g_printf("\tParameter %02d %s\r\n", i, (char *)list_get_item(cs->vnc_params, i)); + } + + return 0; +} |