By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] Patch file of revision 1097263

r1097263.diff (text/plain), 3.19 KB, created by Timothy Pearson on 2010-04-21 09:54:06 CDT

(hide)

Description: Patch file of revision 1097263

Filename:

MIME Type:

Creator: Timothy Pearson

Created: 2010-04-21 09:54:06 CDT

Size: 3.19 KB

patch

obsolete

>--- trunk/KDE/kdebase/workspace/kdm/backend/auth.c 2010/02/28 20:36:40 1097262 >+++ trunk/KDE/kdebase/workspace/kdm/backend/auth.c 2010/02/28 20:37:01 1097263 >@@ -319,15 +319,29 @@ > } > > >+static FILE * >+mkTempFile( char *nambuf, int namelen ) >+{ >+ FILE *f; >+ int r; >+ >+ for (r = 0; r < 100; r++) { >+ randomStr( nambuf + namelen ); >+ if ((f = fdOpenW( open( nambuf, O_WRONLY | O_CREAT | O_EXCL, 0600 ) ))) >+ return f; >+ if (errno != EEXIST) >+ break; >+ } >+ return 0; >+} >+ > #define NAMELEN 255 > > static FILE * > makeServerAuthFile( struct display *d ) > { > FILE *f; >-#ifndef HAVE_MKSTEMP >- int r; >-#endif >+ int i; > char cleanname[NAMELEN], nambuf[NAMELEN+128]; > > /* >@@ -339,22 +353,11 @@ > if (mkdir( authDir, 0755 ) < 0 && errno != EEXIST) > return 0; > cleanUpFileName( d->name, cleanname, NAMELEN - 8 ); >-#ifdef HAVE_MKSTEMP >- sprintf( nambuf, "%s/A%s-XXXXXX", authDir, cleanname ); >- if ((f = fdOpenW( mkstemp( nambuf ) ))) { >+ i = sprintf( nambuf, "%s/A%s-", authDir, cleanname ); >+ if ((f = mkTempFile( nambuf, i ))) { > strDup( &d->authFile, nambuf ); > return f; > } >-#else >- for (r = 0; r < 100; r++) { >- sprintf( nambuf, "%s/A%s-XXXXXX", authDir, cleanname ); >- (void)mktemp( nambuf ); >- if ((f = fdOpenW( open( nambuf, O_WRONLY | O_CREAT | O_EXCL, 0600 ) ))) { >- strDup( &d->authFile, nambuf ); >- return f; >- } >- } >-#endif > return 0; > } > >@@ -1203,19 +1206,8 @@ > * temporary - we can assume that we are the only ones > * knowing about this file anyway. > */ >-#ifdef HAVE_MKSTEMP >- sprintf( name_buf, "%s/.XauthXXXXXX", d->userAuthDir ); >- new = fdOpenW( mkstemp( name_buf ) ); >-#else >- for (i = 0; i < 100; i++) { >- sprintf( name_buf, "%s/.XauthXXXXXX", d->userAuthDir ); >- (void)mktemp( name_buf ); >- if ((new = >- fdOpenW( open( name_buf, O_WRONLY | O_CREAT | O_EXCL, >- 0600 ) ))) >- break; >- } >-#endif >+ i = sprintf( name_buf, "%s/.Xauth", d->userAuthDir ); >+ new = mkTempFile( name_buf, i ); > if (!new) { > logError( "Cannot create authorization file in %s: %m\n", > d->userAuthDir ); > >--- trunk/KDE/kdebase/workspace/kdm/backend/dm.h 2010/02/28 20:36:40 1097262 >+++ trunk/KDE/kdebase/workspace/kdm/backend/dm.h 2010/02/28 20:37:01 1097263 >@@ -560,6 +560,7 @@ > int writer( int fd, const void *buf, int len ); > int fGets( char *buf, int max, FILE *f ); > time_t mTime( const char *fn ); >+void randomStr( char *s ); > int hexToBinary( char *out, const char *in ); > void listSessions( int flags, struct display *d, void *ctx, > void (*emitXSess)( struct display *, struct display *, void * ), > >--- trunk/KDE/kdebase/workspace/kdm/backend/util.c 2010/02/28 20:36:40 1097262 >+++ trunk/KDE/kdebase/workspace/kdm/backend/util.c 2010/02/28 20:37:01 1097263 >@@ -35,6 +35,7 @@ > */ > > #include "dm.h" >+#include "dm_auth.h" > #include "dm_error.h" > > #include <string.h> >@@ -570,6 +571,20 @@ > return st.st_mtime; > } > >+void >+randomStr( char *s ) >+{ >+ static const char letters[] = >+ "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; >+ unsigned i, rn = secureRandom(); >+ >+ for (i = 0; i < 6; i++) { >+ *s++ = letters[rn % 62]; >+ rn /= 62; >+ } >+ *s = 0; >+} >+ > static int > strNChrCnt( const char *s, int slen, char c ) > { View Attachment As Diff View Attachment As Raw

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    [x]
  • | Forgot Password
    Login: [x]