[ipfilter-cvs] ipfilter ip_auth.c,

[Darren <dar...@us...>]

Update of /cvsroot/ipfilter/ipfilter
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv30467/ipf5

Modified Files:
	ip_auth.c 
Log Message:
Fix a bug reported in FreeBSD:
http://www.freebsd.org/cgi/query-pr.cgi?pr=118251
And on sourceforge as:
1838530 use of ipf_global in ip_auth.c not fixed


Index: ip_auth.c
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/ip_auth.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ip_auth.c	26 Nov 2007 07:55:06 -0000	1.6
--- ip_auth.c	26 Nov 2007 08:09:10 -0000	1.7
***************
*** 936,949 ****
  	RWLOCK_EXIT(&ipf_authlk);
  
- 	/*
- 	 * We exit ipf_global here because a program that enters in
- 	 * here will have a lock on it and goto sleep having this lock.
- 	 * If someone were to do an 'ipf -D' the system would then
- 	 * deadlock.  The catch with releasing it here is that the
- 	 * caller of this function expects it to be held when we
- 	 * return so we have to reacquire it in here.
- 	 */
- 	RWLOCK_EXIT(&ipf_global);
- 
  	MUTEX_ENTER(&ipf_auth_mx);
  #ifdef	_KERNEL
--- 936,939 ----
***************
*** 974,978 ****
  #endif
  	MUTEX_EXIT(&ipf_auth_mx);
- 	READ_ENTER(&ipf_global);
  	if (error == 0)
  		goto ipf_auth_ioctlloop;
--- 964,967 ----