patch: policy update by id

[Jamal Hadi Salim <hadi@znyx.com>]

[-- Attachment #1: Type: text/plain, Size: 412 bytes --]


Herbert,

I think this is a reasonable thing to have. I should be able to update
(just like delete or get) a policy by id. And that it trumps a selector
when both are specified..
I am assuming ids are unique - otherwise we have a serious problem.
If this patch looks good, please add it to your patch collection that
you are queueing for Dave; btw - is that stuff supposed to show up
around .13?

cheers,
jamal

[-- Attachment #2: polid_p --]
[-- Type: text/plain, Size: 539 bytes --]

--- a/net/xfrm/xfrm_policy.c	2005/04/27 11:32:13	1.1
+++ b/net/xfrm/xfrm_policy.c	2005/04/27 11:48:42
@@ -345,7 +345,9 @@
 
 	write_lock_bh(&xfrm_policy_lock);
 	for (p = &xfrm_policy_list[dir]; (pol=*p)!=NULL;) {
-		if (!delpol && memcmp(&policy->selector, &pol->selector, sizeof(pol->selector)) == 0) {
+		if (!delpol && 
+		((!excl && policy->id && (policy->id == pol->id)) || 
+		 (memcmp(&policy->selector, &pol->selector, sizeof(pol->selector)) == 0))) {
 			if (excl) {
 				write_unlock_bh(&xfrm_policy_lock);
 				return -EEXIST;