Merged revisions 59939 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r59939 | russell | 2007-04-03 14:16:53 -0500 (Tue, 03 Apr 2007) | 12 lines

Merged revisions 59938 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r59938 | russell | 2007-04-03 14:15:04 -0500 (Tue, 03 Apr 2007) | 4 lines

Don't attempt to report configuration errors in build_user().  oej pointed out
that for a "friend" entry, this won't work, because all user options are valid
for peers, but not the other way around.

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59940 65c4cc65-6c06-0410-ace0-fbb531ad65f3