[svn-commits] bbryant: branch 1.6.0 r132245 - in /branches/1.6.0: ./ main/manager.c

[SVN commits to the Digium repositories]

Author: bbryant
Date: Fri Jul 18 17:20:28 2008
New Revision: 132245

URL: http://svn.digium.com/view/asterisk?view=rev&rev=132245
Log:
Merged revisions 132242 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r132242 | bbryant | 2008-07-18 17:19:56 -0500 (Fri, 18 Jul 2008) | 4 lines

Fixes problem where manager users loaded from users.conf would be 
removed early (before the routine to load the configuration was 
finished) because a variable wasn't initialized.

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/manager.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/manager.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/manager.c?view=diff&rev=132245&r1=132244&r2=132245
==============================================================================
--- branches/1.6.0/main/manager.c (original)
+++ branches/1.6.0/main/manager.c Fri Jul 18 17:20:28 2008
@@ -3879,6 +3879,7 @@
 					/* Insert into list */
 					AST_LIST_INSERT_TAIL(&users, user, list);
 					user->ha = NULL;
+					user->keep = 1;
 					user->readperm = -1;
 					user->writeperm = -1;
 					/* Default displayconnect from [general] */