Merged changes from 3.14 branch to revno 12687

This commit is contained in:
Andrew Johnson
2016-12-07 16:36:58 -06:00
24 changed files with 441 additions and 384 deletions

View File

@@ -504,6 +504,7 @@ void ca_repeater ()
if ( sockerrno == SOCK_EADDRINUSE ) {
osiSockRelease ();
debugPrintf ( ( "CA Repeater: exiting because a repeater is already running\n" ) );
delete [] pBuf;
return;
}
char sockErrBuf[64];