automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@37972 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago · ebdb3d95b2
parent 2d035ab9a4
commit ebdb3d95b2
1 changed files with 2 additions and 0 deletions
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@ -8714,6 +8714,8 @@ static int set_config(char *config_file, int reload)
 	min_reg_expire = IAX_DEFAULT_REG_EXPIRE;
 	max_reg_expire = IAX_DEFAULT_REG_EXPIRE;
 	maxauthreq = 0;
 	v = ast_variable_browse(cfg, "general");
 	/* Seed initial tos value */