| 1 |
idl0r 10/05/10 19:13:05 |
| 2 |
|
| 3 |
Added: admit-noclass-520696.patch 511666-segfault.patch |
| 4 |
Log: |
| 5 |
Revision bump, fixes http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=520696 and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=511666 |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 net-misc/cfengine/files/admit-noclass-520696.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/files/admit-noclass-520696.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/files/admit-noclass-520696.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: admit-noclass-520696.patch |
| 15 |
=================================================================== |
| 16 |
Fix a bug with admit/grant that let cfengine2 fails when the class |
| 17 |
of a cfengine fragment does not exist and more than a host or IP |
| 18 |
ranges are specified for a path (see #520696) |
| 19 |
|
| 20 |
--- a/src/install.c |
| 21 |
+++ b/src/install.c |
| 22 |
@@ -6561,7 +6561,7 @@ |
| 23 |
if (!IsDefinedClass(classes)) |
| 24 |
{ |
| 25 |
Debug1("Not installing Auth path, no match\n"); |
| 26 |
- InitializeAction(); |
| 27 |
+// InitializeAction(); |
| 28 |
return; |
| 29 |
} |
| 30 |
|
| 31 |
|
| 32 |
|
| 33 |
|
| 34 |
1.1 net-misc/cfengine/files/511666-segfault.patch |
| 35 |
|
| 36 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/files/511666-segfault.patch?rev=1.1&view=markup |
| 37 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/files/511666-segfault.patch?rev=1.1&content-type=text/plain |
| 38 |
|
| 39 |
Index: 511666-segfault.patch |
| 40 |
=================================================================== |
| 41 |
Fix a bug involving CheckFriendReliability (see bug #482439) |
| 42 |
|
| 43 |
Index: cfengine2-2.2.9/src/instrument.c |
| 44 |
=================================================================== |
| 45 |
--- cfengine2-2.2.9.orig/src/instrument.c 2009-03-06 21:25:59.000000000 +0000 |
| 46 |
+++ cfengine2-2.2.9/src/instrument.c 2009-03-06 21:26:31.000000000 +0000 |
| 47 |
@@ -716,11 +716,11 @@ |
| 48 |
key.data = timekey; |
| 49 |
key.size = strlen(timekey)+1; |
| 50 |
|
| 51 |
- if ((errno = dbp->get(dbp,NULL,&key,&value,0)) != 0) |
| 52 |
+ if ((errno = dbpent->get(dbpent,NULL,&key,&value,0)) != 0) |
| 53 |
{ |
| 54 |
if (errno != DB_NOTFOUND) |
| 55 |
{ |
| 56 |
- dbp->err(dbp,errno,NULL); |
| 57 |
+ dbpent->err(dbpent,errno,NULL); |
| 58 |
exit(1); |
| 59 |
} |
| 60 |
} |
Archives