rpms/openvpn/devel BETA21-userpriv-fixups.patch, NONE, 1.1 openvpn.spec, 1.33, 1.34

[Steven Pritchard (steve)]

Author: steve

Update of /cvs/pkgs/rpms/openvpn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15916

Modified Files:
	openvpn.spec 
Added Files:
	BETA21-userpriv-fixups.patch 
Log Message:
Add BETA21-userpriv-fixups.patch from Alon Bar-Lev.

BETA21-userpriv-fixups.patch:

--- NEW FILE BETA21-userpriv-fixups.patch ---
Index: openvpn/tun.c
===================================================================
--- openvpn/tun.c	(revision 2677)
+++ openvpn/tun.c	(revision 2679)
@@ -1221,17 +1221,20 @@
   if (tt)
     {
 #ifdef CONFIG_FEATURE_IPROUTE
-	char command_line[256];
-	/*
-	 * Flush IP configuration for the device
-	 */
-	openvpn_snprintf (command_line, sizeof (command_line),
+	if (tt->type != DEV_TYPE_NULL)
+	  {
+	    char command_line[256];
+	    /*
+	     * Flush IP configuration for the device
+	     */
+	    openvpn_snprintf (command_line, sizeof (command_line),
 			  "%s addr flush dev %s",
 			  iproute_path,
 			  tt->actual_name
 			  );
-	msg (M_INFO, "%s", command_line);
-	system_check (command_line, NULL, S_FATAL, "Linux ip flush failed");
+	    msg (M_INFO, "%s", command_line);
+	    system_check (command_line, NULL, S_FATAL, "Linux ip flush failed");
+	  }
 #endif
       close_tun_generic (tt);
       free (tt);


Index: openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/devel/openvpn.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- openvpn.spec	24 Jan 2008 18:44:27 -0000	1.33
+++ openvpn.spec	25 Jan 2008 19:37:28 -0000	1.34
@@ -15,6 +15,7 @@
 Source3:           roadwarrior-client.conf
 # Don't start openvpn by default.
 Patch0:            openvpn-init.patch
+Patch1:            BETA21-userpriv-fixups.patch
 License:           GPL
 Group:             Applications/Internet
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-%(id -un)
@@ -49,6 +50,7 @@
 %prep
 %setup -q -n %{name}-%{version}%{?prerelease:_%{prerelease}}
 %patch0 -p0
+%patch1 -p1
 sed -i -e 's,%{_datadir}/openvpn/plugin,%{_libdir}/openvpn/plugin,' openvpn.8
 
 # %%doc items shouldn't be executable.
@@ -168,6 +170,7 @@
 - Update to 2.1_rc6
 - Pass paths to ifconfig, ip, and route to configure
 - BR iproute and Require iproute and net-tools
+- Add BETA21-userpriv-fixups.patch from Alon Bar-Lev
 
 * Wed Jan 23 2008 Steven Pritchard <steve at kspei.com> 2.1-0.21.rc5
 - Update to 2.1_rc5