rpms/kernel/devel selinux-netlabel_setsockopt_fix.patch,1.1,1.2

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29639

Modified Files:
	selinux-netlabel_setsockopt_fix.patch 
Log Message:
update selinux-netlabel_setsockopt_fix.patch, accidently committed v1 to rawhide before

selinux-netlabel_setsockopt_fix.patch:

Index: selinux-netlabel_setsockopt_fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/selinux-netlabel_setsockopt_fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- selinux-netlabel_setsockopt_fix.patch	22 Feb 2009 18:13:10 -0000	1.1
+++ selinux-netlabel_setsockopt_fix.patch	23 Feb 2009 02:59:29 -0000	1.2
@@ -18,21 +18,22 @@
 Signed-off-by: Paul Moore <paul.moore at hp.com>
 ---
 
- security/selinux/netlabel.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ security/selinux/netlabel.c |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
 
 
 diff --git a/security/selinux/netlabel.c b/security/selinux/netlabel.c
-index f58701a..7c0be4f 100644
+index f58701a..3f4b266 100644
 --- a/security/selinux/netlabel.c
 +++ b/security/selinux/netlabel.c
-@@ -490,8 +490,8 @@ int selinux_netlbl_socket_setsockopt(struct socket *sock,
+@@ -490,8 +490,10 @@ int selinux_netlbl_socket_setsockopt(struct socket *sock,
  		lock_sock(sk);
  		rc = netlbl_sock_getattr(sk, &secattr);
  		release_sock(sk);
 -		if (rc == 0 && secattr.flags != NETLBL_SECATTR_NONE)
--			rc = -EACCES;
-+		if (rc == -ENOMSG)
++		if (rc == 0)
+ 			rc = -EACCES;
++		else if (rc == -ENOMSG)
 +			rc = 0;
  		netlbl_secattr_destroy(&secattr);
  	}