[Pkg-voip-commits] r6012 - in /iaxmodem/trunk/debian: changelog patches/00list patches/01_seteuid_setegid_ordering.dpatch

[jblache at alioth.debian.org]

Author: jblache
Date: Wed Jul 30 17:47:51 2008
New Revision: 6012

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6012
Log:
Fix seteuid()/setegid() call order.

Added:
    iaxmodem/trunk/debian/patches/01_seteuid_setegid_ordering.dpatch   (with props)
Modified:
    iaxmodem/trunk/debian/changelog
    iaxmodem/trunk/debian/patches/00list

Modified: iaxmodem/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/iaxmodem/trunk/debian/changelog?rev=6012&op=diff
==============================================================================
--- iaxmodem/trunk/debian/changelog (original)
+++ iaxmodem/trunk/debian/changelog Wed Jul 30 17:47:51 2008
@@ -1,8 +1,10 @@
-iaxmodem (1.1.1~dfsg-2) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
-
- -- Julien BLACHE <jblache at debian.org>  Sat, 19 Jul 2008 21:41:26 +0200
+iaxmodem (1.1.1~dfsg-2) unstable; urgency=low
+
+  * debian/patches/01_seteuid_setegid_ordering.dpatch:
+    + Added; call setegid() before seteuid() when dropping privileges, otherwise
+      setegid() will fail once we're no longer root.
+
+ -- Julien BLACHE <jblache at debian.org>  Wed, 30 Jul 2008 19:43:58 +0200
 
 iaxmodem (1.1.1~dfsg-1) unstable; urgency=low
 

Modified: iaxmodem/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/iaxmodem/trunk/debian/patches/00list?rev=6012&op=diff
==============================================================================
--- iaxmodem/trunk/debian/patches/00list (original)
+++ iaxmodem/trunk/debian/patches/00list Wed Jul 30 17:47:51 2008
@@ -1,3 +1,4 @@
+01_seteuid_setegid_ordering
 10_replacement_spandsp_mmx_h
 11_build_configure-stamp
 

Added: iaxmodem/trunk/debian/patches/01_seteuid_setegid_ordering.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/iaxmodem/trunk/debian/patches/01_seteuid_setegid_ordering.dpatch?rev=6012&op=file
==============================================================================
--- iaxmodem/trunk/debian/patches/01_seteuid_setegid_ordering.dpatch (added)
+++ iaxmodem/trunk/debian/patches/01_seteuid_setegid_ordering.dpatch Wed Jul 30 17:47:51 2008
@@ -1,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_seteuid_setegid_ordering.dpatch by  <jblache at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix ordering of the seteuid() and setegid() calls to drop privileges.
+## DP: setegid() must be called first, or will fail once we're no longer root.
+
+ at DPATCH@
+diff -urNad iaxmodem-1.1.1~dfsg~/iaxmodem.c iaxmodem-1.1.1~dfsg/iaxmodem.c
+--- iaxmodem-1.1.1~dfsg~/iaxmodem.c	2008-07-19 17:37:53.000000000 +0200
++++ iaxmodem-1.1.1~dfsg/iaxmodem.c	2008-07-30 19:42:42.947597456 +0200
+@@ -856,8 +856,8 @@
+     }
+ 
+     /* Root privileges not needed anymore, drop privs. */
+-    seteuid(uucp_uid);
+     setegid(uucp_gid);
++    seteuid(uucp_uid);
+     
+     if ((port = iax_init(port) < 0)) {
+ 	printlog(LOG_ERROR, "Fatal error: failed to initialize iax with port %d\n", port);

Propchange: iaxmodem/trunk/debian/patches/01_seteuid_setegid_ordering.dpatch
------------------------------------------------------------------------------
    svn:executable = *