[svn-commits] kpfleming: trunk r90100 - in /trunk: ./ configs/users.conf.sample main/manager.c

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Wed Nov 28 16:44:38 2007
New Revision: 90100

URL: http://svn.digium.com/view/asterisk?view=rev&rev=90100
Log:
Merged revisions 90098 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r90098 | kpfleming | 2007-11-28 16:30:46 -0600 (Wed, 28 Nov 2007) | 2 lines

it is impossible to set permissions for manager accounts created by users.conf (reported internally, patched by me)

........

Modified:
    trunk/   (props changed)
    trunk/configs/users.conf.sample
    trunk/main/manager.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/configs/users.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/users.conf.sample?view=diff&rev=90100&r1=90099&r2=90100
==============================================================================
--- trunk/configs/users.conf.sample (original)
+++ trunk/configs/users.conf.sample Wed Nov 28 16:44:38 2007
@@ -46,6 +46,11 @@
 ;
 hasmanager = no
 ;
+; Set permissions for manager entry (see manager.conf.sample for documentation)
+; (defaults to *all* permissions)
+;managerread = system,call,log,verbose,command,agent,user,config
+;managerwrite = system,call,log,verbose,command,agent,user,config
+;
 ; Remaining options are not specific to users.conf entries but are general.
 ;
 callwaiting = yes

Modified: trunk/main/manager.c
URL: http://svn.digium.com/view/asterisk/trunk/main/manager.c?view=diff&rev=90100&r1=90099&r2=90100
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Wed Nov 28 16:44:38 2007
@@ -1037,9 +1037,12 @@
 					ast_log(LOG_WARNING, "Invalid writetimeout value '%s' at line %d\n", v->value, v->lineno);
 				else
 					s->writetimeout = val;
-			} else if (!strcasecmp(v->name, "hasmanager")) {
+			} else if (!strcasecmp(v->name, "hasmanager"))
 				hasmanager = ast_true(v->value);
-			}
+			else if (!strcasecmp(v->name, "managerread"))
+				readperm = get_perm(v->value);
+			else if (!strcasecmp(v->name, "managerwrite"))
+				writeperm = get_perm(v->value);
 		}
 		ast_config_destroy(cfg);
 		if (!hasmanager) {