old
/
entrance
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

entrance: entrance_init now init display name but not the cookie

This commit is contained in:
Michael Bouchaud 2014-01-16 21:50:15 +01:00
parent 32d5022a9f
commit a005f75fc0
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/daemon/entrance.c
View File

@ -154,11 +154,10 @@ _entrance_main(const char *dname)
char buf[PATH_MAX]; char buf[PATH_MAX];
ecore_event_handler_add(ECORE_EXE_EVENT_DEL, ecore_event_handler_add(ECORE_EXE_EVENT_DEL,
_entrance_client_del, NULL); _entrance_client_del, NULL);
PT("Exec entrance_client: ");
snprintf(buf, sizeof(buf), snprintf(buf, sizeof(buf),
PACKAGE_BIN_DIR"/entrance_client -d %s -t %s", PACKAGE_BIN_DIR"/entrance_client -d %s -t %s",
dname, entrance_config->theme); dname, entrance_config->theme);
printf("%s\n", buf); PT("Exec entrance_client: %s\n", buf);
_entrance_client = ecore_exe_run(buf, NULL); _entrance_client = ecore_exe_run(buf, NULL);
} }
@ -342,6 +341,7 @@ main (int argc, char ** argv)
PT("session init\n"); PT("session init\n");
entrance_session_init(dname); entrance_session_init(dname);
entrance_session_cookie();
if (!_xephyr) if (!_xephyr)
{ {
PT("xserver init\n"); PT("xserver init\n");

11
src/daemon/entrance_session.c
View File

@ -227,10 +227,16 @@ entrance_session_pid_get(void)
return _session_pid; return _session_pid;
} }
void
entrance_session_init(const char *dname)
{
_dname = dname;
}
static const char *dig = "0123456789abcdef"; static const char *dig = "0123456789abcdef";
void void
entrance_session_init(const char *dname) entrance_session_cookie(void)
{ {
uint16_t word; uint16_t word;
uint8_t hi, lo; uint8_t hi, lo;
@ -256,11 +262,10 @@ entrance_session_init(const char *dname)
entrance_config->command.xauth_file); entrance_config->command.xauth_file);
putenv(strdup(buf)); putenv(strdup(buf));
//PT("cookie %s \n", _mcookie); //PT("cookie %s \n", _mcookie);
_entrance_session_cookie_add(_mcookie, dname, _entrance_session_cookie_add(_mcookie, _dname,
entrance_config->command.xauth_path, entrance_config->command.xauth_path,
entrance_config->command.xauth_file); entrance_config->command.xauth_file);
_entrance_session_desktops_init(); _entrance_session_desktops_init();
_dname = dname;
} }
void void

1
src/daemon/entrance_session.h
View File

@ -3,6 +3,7 @@
#include <pwd.h> #include <pwd.h>
void entrance_session_init(const char *dname); void entrance_session_init(const char *dname);
void entrance_session_cookie(void);
void entrance_session_end(const char *login); void entrance_session_end(const char *login);
void entrance_session_shutdown(void); void entrance_session_shutdown(void);
Eina_Bool entrance_session_authenticate(const char *login, const char *pwd); Eina_Bool entrance_session_authenticate(const char *login, const char *pwd);