Enlightenment CVS committal
Author : xcomputerman
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance/src/daemon
Modified Files:
Entranced.h auth.c spawner.c
Log Message:
Begone, thou unholy Xauth critter
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/daemon/Entranced.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Entranced.h 12 May 2004 19:24:16 -0000 1.4
+++ Entranced.h 15 May 2004 16:10:58 -0000 1.5
@@ -18,8 +18,8 @@
#define ENTRANCED_DEBUG 1
-#define X_SERVER "/usr/X11R6/bin/X -quiet"
-/*#define X_SERVER "/usr/X11R6/bin/Xnest -full" */
+//#define X_SERVER "/usr/X11R6/bin/X -quiet"
+#define X_SERVER "/usr/X11R6/bin/Xnest -full"
#define X_DISP ":0" /* only used if DISPLAY variable is NOT set */
#define ENTRANCE PREFIX "/bin/entrance_wrapper"
#define PIDFILE "/var/run/entranced.pid"
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/daemon/auth.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- auth.c 2 May 2004 22:46:48 -0000 1.13
+++ auth.c 15 May 2004 16:10:58 -0000 1.14
@@ -233,7 +233,9 @@
entranced_auth_display_secure (Entranced_Display *d)
{
FILE *auth_file;
+#if 0
FILE *host_file;
+#endif
char buf[PATH_MAX];
char hostname[1024];
@@ -285,6 +287,12 @@
fclose(auth_file);
setenv("XAUTHORITY", d->authfile, TRUE);
+
+ /* TODO: This will become a config option -- perhaps desirable for
+ * single-user systems, but not multi-user machines.
+ * For now it is disabled.
+ */
+#if 0
/* Write host access file */
snprintf(buf, PATH_MAX, "/etc/X%d.hosts", d->dispnum);
if (!(host_file = fopen(buf, "w")))
@@ -294,6 +302,8 @@
}
fprintf(host_file, "%s\n", d->hostname);
fclose(host_file);
+#endif
+
entranced_debug("entranced_auth_display_secure: Successfully set up access for %s
(localhost)\n", d->name);
return TRUE;
@@ -353,7 +363,7 @@
}
/* Open file and write auth entries */
- if(!(auth_file = fopen(d->client.authfile, "a+")))
+ if(!(auth_file = fopen(d->client.authfile, "r+")))
{
syslog(LOG_CRIT, "entranced_auth_user_add: Open auth file %s failed after
lock", d->client.authfile);
XauUnlockAuth (d->client.authfile);
@@ -411,7 +421,7 @@
}
/* Open the file */
- if (!(auth_file = fopen(d->client.authfile, "a+")))
+ if (!(auth_file = fopen(d->client.authfile, "r+")))
{
XauUnlockAuth(d->client.authfile);
free(d->client.authfile);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/daemon/spawner.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- spawner.c 12 May 2004 19:24:16 -0000 1.17
+++ spawner.c 15 May 2004 16:10:58 -0000 1.18
@@ -357,6 +357,8 @@
return 1;
}
+ entranced_auth_user_remove(d);
+
Entranced_Spawn_Entrance(d);
return 1;
-------------------------------------------------------
This SF.Net email is sponsored by: SourceForge.net Broadband
Sign-up now for SourceForge Broadband and get the fastest
6.0/768 connection for only $19.95/mo for the first 3 months!
http://ads.osdn.com/?ad_id=2562&alloc_id=6184&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
