[maemo-commits] [maemo-commits] r8488 - in projects/connectivity/osso-obexsrv/trunk: . debian src

[From: www-data at stage.maemo.org]

Author: jh
Date: 2006-11-30 10:54:52 +0200 (Thu, 30 Nov 2006)
New Revision: 8488

Modified:
   projects/connectivity/osso-obexsrv/trunk/configure.ac
   projects/connectivity/osso-obexsrv/trunk/debian/changelog
   projects/connectivity/osso-obexsrv/trunk/debian/obexsrv.init
   projects/connectivity/osso-obexsrv/trunk/src/obex.c
Log:
* Change DSME policy to restart
* Stricter checking of type headers


Modified: projects/connectivity/osso-obexsrv/trunk/configure.ac
===================================================================
--- projects/connectivity/osso-obexsrv/trunk/configure.ac	2006-11-30 08:22:33 UTC (rev 8487)
+++ projects/connectivity/osso-obexsrv/trunk/configure.ac	2006-11-30 08:54:52 UTC (rev 8488)
@@ -1,4 +1,4 @@
-AC_INIT([osso-obexsrv],[0.11.1])
+AC_INIT([osso-obexsrv],[0.12])
 
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)

Modified: projects/connectivity/osso-obexsrv/trunk/debian/changelog
===================================================================
--- projects/connectivity/osso-obexsrv/trunk/debian/changelog	2006-11-30 08:22:33 UTC (rev 8487)
+++ projects/connectivity/osso-obexsrv/trunk/debian/changelog	2006-11-30 08:54:52 UTC (rev 8488)
@@ -1,3 +1,10 @@
+osso-obexsrv (0.12) unstable; urgency=low
+
+  * Change DSME policy to restart. Fixes: NB#48738
+  * Check type headers for validness
+
+ -- Johan Hedberg <johan.hedberg at nokia.com>  Thu, 30 Nov 2006 11:00:43 +0200
+
 osso-obexsrv (0.11.1) unstable; urgency=low
 
   * Change startup position from S50 to S70. Fixes NB#45776

Modified: projects/connectivity/osso-obexsrv/trunk/debian/obexsrv.init
===================================================================
--- projects/connectivity/osso-obexsrv/trunk/debian/obexsrv.init	2006-11-30 08:22:33 UTC (rev 8487)
+++ projects/connectivity/osso-obexsrv/trunk/debian/obexsrv.init	2006-11-30 08:54:52 UTC (rev 8488)
@@ -25,7 +25,7 @@
   start)
 	echo -n "Starting $DESC: "
 	if [ "$USE_DSMETOOL" = "yes" ]; then
-		dsmetool -n -1 $USER_FLAGS -r "$DAEMON -l $DAEMON_OPTS"
+		dsmetool -n -1 $USER_FLAGS -t "$DAEMON -l $DAEMON_OPTS"
 	else
 		start-stop-daemon --start --quiet $USER_FLAGS \
 			--exec $DAEMON -- -d $DAEMON_OPTS

Modified: projects/connectivity/osso-obexsrv/trunk/src/obex.c
===================================================================
--- projects/connectivity/osso-obexsrv/trunk/src/obex.c	2006-11-30 08:22:33 UTC (rev 8487)
+++ projects/connectivity/osso-obexsrv/trunk/src/obex.c	2006-11-30 08:54:52 UTC (rev 8488)
@@ -290,6 +290,11 @@
                 if (hv.bs[hlen - 1] != '\0')
                     break;
 
+                if (!g_utf8_validate(hv.bs, -1, NULL)) {
+                    debug("Invalid type header: %s", hv.bs);
+                    break;
+                }
+
                 xfer->type = g_strdup((const char *)hv.bs);
 
                 debug("  Type: %s", xfer->type);