[E-devel] [patch] small fix for entranced

[Morten Nilsen]

This is my first patch, so be gentle ;)

eliminates some string duplications, and makes syntax in 
entranced_cookie_new more in tune with the other functions in auth.c

Cheers,
--
Morten
Index: src/daemon/auth.c
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/daemon/auth.c,v
retrieving revision 1.18
diff -u -r1.18 auth.c
--- src/daemon/auth.c   5 Sep 2005 12:05:57 -0000       1.18
+++ src/daemon/auth.c   5 Nov 2005 22:42:52 -0000
@@ -17,7 +17,8 @@
 
 #define AUTH_DATA_LEN 16
 
-char * entranced_cookie_new (void) 
+int
+entranced_cookie_new (char *cookie) 
 {
    int                     fd;
    int                     r;
@@ -25,7 +26,6 @@
    unsigned char           digest[MD5_HASHBYTES];
    double                  ctime;
    pid_t                   pid;
-   char                    *cookie;
    Entranced_MD5_Context   *ctx = NULL;
 
    entranced_md5_init(&ctx);
@@ -38,30 +38,24 @@
    entranced_md5_update(ctx, (unsigned char *) &pid, sizeof(pid));
    
 
-   if ((fd = open("/dev/random", O_RDONLY|O_NONBLOCK)) < 0) {
+   if ((fd = open("/dev/random", O_RDONLY|O_NONBLOCK)) < 0)
+   {
       entranced_debug("Cookie generation failed: could not open 
/dev/random\n");
-      return NULL;
+      return 0;
    }
 
-   if((r = read(fd, buf, sizeof(buf))) <= 0) {
+   if((r = read(fd, buf, sizeof(buf))) <= 0)
+   {
       entranced_debug("Cookie generation failed: could not read 
/dev/random\n");
-      return NULL;
+      return 0;
    }
 
    entranced_md5_update(ctx, buf, r);
    entranced_md5_final(digest, ctx);
 
-   cookie = calloc(1, 16);
-#if 0
-   for (i = 0; i < MD5_HASHBYTES; ++i) {
-      char tmp[3];
-      snprintf(tmp, sizeof(tmp), "%02x", (unsigned int) digest[i]);
-      strcat(cookie, tmp);
-   }
-#endif
-
    memcpy(cookie, digest, MD5_HASHBYTES);
-   return cookie;
+
+   return 1;
 }
 
 static void
@@ -129,7 +123,6 @@
 entranced_auth_mit_get(void)
 {
    Xauth    *new;
-   char     *cookie;
 
    new = (Xauth *) malloc(sizeof(Xauth));
 
@@ -142,28 +135,24 @@
    new->number = 0;
 
    new->data = (char *) malloc(AUTH_DATA_LEN);
+   new->data_length = AUTH_DATA_LEN;
    if(!new->data)
    {
       free(new);
       return NULL;
    }
-   
+
    new->name = strdup("MIT-MAGIC-COOKIE-1");
    new->name_length = 18;
-   cookie = entranced_cookie_new();
-   if (!cookie)
+   
+   if(!entranced_cookie_new(new->data))
    {
       free(new->name);
       free(new->data);
       free(new);
       return NULL;
    }
-   
-   memcpy(new->data, cookie, AUTH_DATA_LEN);
-   new->data_length = AUTH_DATA_LEN;
 
-   free(cookie);
-   
    return new;
 }
 
Index: src/daemon/auth.h
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/daemon/auth.h,v
retrieving revision 1.1
diff -u -r1.1 auth.h
--- src/daemon/auth.h   23 Mar 2004 00:29:43 -0000      1.1
+++ src/daemon/auth.h   5 Nov 2005 22:42:52 -0000
@@ -5,7 +5,7 @@
 #include <X11/Xauth.h>
 #include <X11/Xos.h>
 
-char  *entranced_cookie_new(void);
+int    entranced_cookie_new(char *cookie);
 Xauth *entranced_auth_mit_get(void);
 int    entranced_auth_display_secure(Entranced_Display *d);
 int    entranced_auth_user_add(Entranced_Display *d, const char *homedir);