tags 292618 +patch
thanks

The attached patch fixes WvModem::setup_modem to not treat it as a fatal
error when non-root users are unable to use the TIOCSSERIAL ioctl.

Incidentally, the other use of HAVE_LINUX_SERIAL_H in streams/wvmodem.cc
looks quite broken:  there is no reason that declaration of the cfmakeraw()
function should be correlated with the presence of the linux/serial.h
header.  Please add a proper autoconf check to detect cfmakeraw() support
separately instead of tacking it onto the check for a completely unrelated
header.

-- 
Steve Langasek
postmodern programmer
diff -u wvstreams-4.0.1/debian/changelog wvstreams-4.0.1/debian/changelog
--- wvstreams-4.0.1/debian/changelog
+++ wvstreams-4.0.1/debian/changelog
@@ -1,3 +1,12 @@
+wvstreams (4.0.1-1.3) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * High-urgency upload for sarge-targetted RC bugfix
+  * Fix WvModem::setup_modem to not expect TIOCSSERIAL to work if we're not
+    root.  (Closes: #292618)
+
+ -- Steve Langasek <[EMAIL PROTECTED]>  Sat,  5 Feb 2005 02:45:25 -0800
+
 wvstreams (4.0.1-1.2) unstable; urgency=high
 
   * NMU with maintainer's permission
only in patch2:
unchanged:
--- wvstreams-4.0.1.orig/streams/wvmodem.cc
+++ wvstreams-4.0.1/streams/wvmodem.cc
@@ -204,7 +204,7 @@
     sinfo.closing_wait = ASYNC_CLOSING_WAIT_NONE;
     sinfo.closing_wait2 = ASYNC_CLOSING_WAIT_NONE;
 
-    if (ioctl(getrfd(), TIOCSSERIAL, &sinfo) < 0) 
+    if (ioctl(getrfd(), TIOCSSERIAL, &sinfo) < 0 && getuid() == 0) 
     {
        seterr("Cannot set information for serial port.");
        return;

Attachment: signature.asc
Description: Digital signature

Reply via email to