[Ipsec-tools-commits] ipsec-tools/src/racoon cfparse.y,1.16,1.17

[Aidas K. <mo...@us...>]

Update of /cvsroot/ipsec-tools/ipsec-tools/src/racoon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7344/src/racoon

Modified Files:
	cfparse.y 
Log Message:
thinko


Index: cfparse.y
===================================================================
RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/racoon/cfparse.y,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- cfparse.y	4 Oct 2004 16:44:55 -0000	1.16
+++ cfparse.y	4 Oct 2004 16:57:06 -0000	1.17
@@ -843,8 +843,8 @@
 			cur_rmconf = new;
 
 			prspec = newprspec();
-			if (prspec == NULL && !cur_rmconf->inherited_from 
-				&& !cur_rmconf->inherited_from->proposal)
+			if (prspec == NULL || !cur_rmconf->inherited_from 
+				|| !cur_rmconf->inherited_from->proposal)
 				return -1;
 			prspec->lifetime = cur_rmconf->inherited_from->proposal->lifetime;
 			prspec->lifebyte = cur_rmconf->inherited_from->proposal->lifebyte;