kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-03 12:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@59989 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge Script
2007-04-03 19:53:08 +00:00
parent 624988bd1e
commit 7a1390a0c6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
channels/chan_sip.c
View File

@@ -12453,8 +12453,10 @@ static struct sip_user *build_user(const char *name, struct ast_variable *v, int
user->callingpres = ast_parse_caller_presentation(v->value);
if (user->callingpres == -1)
user->callingpres = atoi(v->value);
} else if (strcasecmp(v->name, "type"))
ast_log(LOG_WARNING, "Ignoring unknown option '%s' at line %d of sip.conf!\n", v->name, v->lineno);
}
/* We can't just report unknown options here because this may be a
* type=friend entry. All user options are valid for a peer, but not
* the other way around. */
v = v->next;
}
ast_copy_flags(user, &userflags, mask.flags);