1 |
philantrop 07/12/01 17:29:57 |
2 |
|
3 |
Added: kdm-3.5.8-login.diff digest-kdebase-3.5.8-r2 |
4 |
Log: |
5 |
Added an upstream patch to fix some KDM login issues. Fixes bug 200856. |
6 |
(Portage version: 2.1.4_rc4) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 kde-base/kdebase/files/kdm-3.5.8-login.diff |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase/files/kdm-3.5.8-login.diff?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase/files/kdm-3.5.8-login.diff?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: kdm-3.5.8-login.diff |
15 |
=================================================================== |
16 |
--- kdm/backend/inifile.c |
17 |
+++ kdm/backend/inifile.c |
18 |
@@ -37,6 +37,7 @@ |
19 |
#include "dm_error.h" |
20 |
|
21 |
#include <sys/types.h> |
22 |
+#include <sys/stat.h> |
23 |
#include <unistd.h> |
24 |
#include <stdlib.h> |
25 |
#include <string.h> |
26 |
@@ -47,17 +48,27 @@ |
27 |
{ |
28 |
char *data; |
29 |
int fd, len; |
30 |
+ struct stat st; |
31 |
|
32 |
if ((fd = open( fname, O_RDONLY | O_NONBLOCK )) < 0) { |
33 |
Debug( "cannot open ini-file %\"s: %m", fname ); |
34 |
return 0; |
35 |
} |
36 |
- len = lseek( fd, 0, SEEK_END ); |
37 |
+ if (fstat( fd, &st ) || !S_ISREG( st.st_mode )) { |
38 |
+ LogWarn( "Ini-file %\"s is no regular file\n", fname ); |
39 |
+ close( fd ); |
40 |
+ return 0; |
41 |
+ } |
42 |
+ if (st.st_size >= 0x10000) { |
43 |
+ LogWarn( "Ini-file %\"s is too big\n", fname ); |
44 |
+ close( fd ); |
45 |
+ return 0; |
46 |
+ } |
47 |
+ len = st.st_size; |
48 |
if (!(data = Malloc( len + 2 ))) { |
49 |
close( fd ); |
50 |
return 0; |
51 |
} |
52 |
- lseek( fd, 0, SEEK_SET ); |
53 |
if (read( fd, data, len ) != len) { |
54 |
Debug( "cannot read ini-file %\"s: %m", fname ); |
55 |
free( data ); |
56 |
|
57 |
|
58 |
|
59 |
1.1 kde-base/kdebase/files/digest-kdebase-3.5.8-r2 |
60 |
|
61 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase/files/digest-kdebase-3.5.8-r2?rev=1.1&view=markup |
62 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase/files/digest-kdebase-3.5.8-r2?rev=1.1&content-type=text/plain |
63 |
|
64 |
Index: digest-kdebase-3.5.8-r2 |
65 |
=================================================================== |
66 |
MD5 9a0c6a4983427e41226dee8d0ce23369 kdebase-3.5-patchset-07.tar.bz2 22868 |
67 |
RMD160 37e81cd0bc3943cbbdc100634d79a8eeed73503b kdebase-3.5-patchset-07.tar.bz2 22868 |
68 |
SHA256 fca283e0719231b0716f333034e29727b4d1e1f30cead4e1ae1bca330f00c81b kdebase-3.5-patchset-07.tar.bz2 22868 |
69 |
MD5 9990c669229daaaa8fca4c5e354441fd kdebase-3.5.8.tar.bz2 24200172 |
70 |
RMD160 6441b5eaead5fff5c42c532fb11c0d37001cb6ea kdebase-3.5.8.tar.bz2 24200172 |
71 |
SHA256 0f1876d1c68f01ed8fee346c1bae4f53dd2c1dc56db94e309b3d1adfc6138493 kdebase-3.5.8.tar.bz2 24200172 |
72 |
|
73 |
|
74 |
|
75 |
-- |
76 |
gentoo-commits@g.o mailing list |