[svn-commits] trunk - r292 in /trunk: ./ q931.c

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Tue Jan 17 07:44:12 2006
New Revision: 292

URL: http://svn.digium.com/view/libpri?rev=292&view=rev
Log:
Merged revisions 291 via svnmerge from 
https://origsvn.digium.com/svn/libpri/branches/1.2

........
r291 | kpfleming | 2006-01-17 07:43:18 -0600 (Tue, 17 Jan 2006) | 2 lines

ensure that user-user info field in call is properly reset when not needed

........

Modified:
    trunk/   (props changed)
    trunk/q931.c

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jan 17 07:44:12 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-274
+/branches/1.2:1-279,281-283,285-289,291

Modified: trunk/q931.c
URL: http://svn.digium.com/view/libpri/trunk/q931.c?rev=292&r1=291&r2=292&view=diff
==============================================================================
--- trunk/q931.c (original)
+++ trunk/q931.c Tue Jan 17 07:44:12 2006
@@ -2833,6 +2833,8 @@
 
 	if (req->useruserinfo)
 		libpri_copy_string(c->useruserinfo, req->useruserinfo, sizeof(c->useruserinfo));
+	else
+		c->useruserinfo[0] = '\0';
 
 	if (req->nonisdn && (pri->switchtype == PRI_SWITCH_NI2))
 		c->progressmask = PRI_PROG_CALLER_NOT_ISDN;