------------------------------------------------------------ revno: 5951 committer: David Martin <david.martin.mailbox@xxxxxxxxxxxxxx> branch nick: hipl_startup timestamp: Fri 2011-06-03 12:26:16 +0200 message: Rephrase ambiguous error message in hip_xfrm_policy_delete(). If the call to netlink_talk() fails when a policy is to be deleted it does not mean that there has been no associated policy. It can fail for any number of reasons (no socket has been set up, a malformed message was provided etc.). Thus only state that the policy deletion failed. modified: lib/tool/xfrmapi.c -- lp:hipl https://code.launchpad.net/~hipl-core/hipl/trunk Your team HIPL core team is subscribed to branch lp:hipl. To unsubscribe from this branch go to https://code.launchpad.net/~hipl-core/hipl/trunk/+edit-subscription
=== modified file 'lib/tool/xfrmapi.c' --- lib/tool/xfrmapi.c 2011-04-05 16:44:22 +0000 +++ lib/tool/xfrmapi.c 2011-06-03 10:26:16 +0000 @@ -379,7 +379,7 @@ HIP_IFE(hip_xfrm_fill_selector(&req.xpid.sel, hit_peer, hit_our, 0, hit_prefix, preferred_family), -1); HIP_IFEL(netlink_talk(rth, &req.n, 0, 0, NULL, NULL, NULL) < 0, -1, - "No associated policies to be deleted\n"); + "Security policy deletion failed.\n"); out_err: return err;