[Asterisk-cvs] asterisk/apps app_privacy.c,1.8,1.9

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv23808/apps

Modified Files:
	app_privacy.c 
Log Message:
Fix privacy manager to "do the right things" with blank, but present, callerid (bug #3294)


Index: app_privacy.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_privacy.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- app_privacy.c	12 Dec 2004 01:24:35 -0000	1.8
+++ app_privacy.c	9 Jan 2005 10:37:03 -0000	1.9
@@ -69,13 +69,10 @@
 	struct ast_config *cfg;
 
 	LOCAL_USER_ADD (u);
-	if (chan->cid.cid_num)
-	{
+	if (chan->cid.cid_num && !ast_strlen_zero(chan->cid.cid_num)) {
 		if (option_verbose > 2)
 			ast_verbose (VERBOSE_PREFIX_3 "CallerID Present: Skipping\n");
-	}
-	else
-	{
+	} else {
 		/*Answer the channel if it is not already*/
 		if (chan->_state != AST_STATE_UP) {
 			res = ast_answer(chan);