From: <enl...@li...> - 2003-09-11 14:41:12
|
Enlightenment CVS committal Author : raster Project : e17 Module : apps/entrance Dir : e17/apps/entrance/src/client Modified Files: entrance_auth.c entrance_session.c main.c Log Message: 1. displays right. 2. authenticates properly now (see comments!) 3. executes correct Xsession :) =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/client/entrance_auth.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- entrance_auth.c 25 Jul 2003 05:20:02 -0000 1.3 +++ entrance_auth.c 11 Sep 2003 14:40:40 -0000 1.4 @@ -110,7 +110,16 @@ e->pam.handle = NULL; if ((pamerr = - pam_start("entrance", e->user, &(e->pam.conv), + /* NB NB NB: if we use "entrance" as the unique pam auth type */ + /* you need to make a new file in /etc/pam.d of that same name */ + /* (ie entrance). you can quickly do this by: */ + /* */ + /* cd /etc/pam.d */ + /* cp xdm entrance */ + /* */ + /* but for ease of use we masquerade as xdm */ + + pam_start("xdm", e->user, &(e->pam.conv), &(e->pam.handle))) != PAM_SUCCESS) { syslog(LOG_CRIT, "PAM: %s.", pam_strerror(e->pam.handle, pamerr)); =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/client/entrance_session.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- entrance_session.c 25 Jul 2003 06:06:42 -0000 1.9 +++ entrance_session.c 11 Sep 2003 14:40:40 -0000 1.10 @@ -121,9 +121,9 @@ entrance_auth_setup_environment(e->auth); if((session_key = (char*)evas_hash_find(e->config->sessions, e->session))) - snprintf(buf, PATH_MAX, "/etc/X11/Xsession %s", session_key); + snprintf(buf, PATH_MAX, "/etc/X11/xdm/Xsession %s", session_key); else - snprintf(buf, PATH_MAX, "/etc/X11/Xsession"); /* Default session */ + snprintf(buf, PATH_MAX, "/etc/X11/xdm/Xsession"); /* Default session */ /* If a path was specified for the session, use that path instead of passing the session name to Xsession */ =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/client/main.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- main.c 26 Jul 2003 15:15:01 -0000 1.6 +++ main.c 11 Sep 2003 14:40:40 -0000 1.7 @@ -114,7 +114,8 @@ exit_cb(void *data, int ev_type, void *ev) { ecore_main_loop_quit(); - exit(0); +// exit(0); + return 1; } /** @@ -125,7 +126,7 @@ window_del_cb(Ecore_Evas *ee) { ecore_main_loop_quit(); - exit(0); +// exit(0); } /** @@ -541,6 +542,7 @@ edje_object_signal_emit(edje, "In", "EntranceUserEntry"); #if (X_TESTING == 0) + ecore_evas_resize(e, WINW, WINH); ecore_evas_fullscreen_set(e, 1); #elif (X_TESTING == 1) ecore_evas_resize(e, WINW, WINH); |