[yast-commit] r55884 - in /trunk/apparmor/src: agents/ag_subdomain_profiles include/subdomain/profile_dialogs.ycp

Author: kmachalkova Date: Tue Mar 3 14:45:26 2009 New Revision: 55884 URL: http://svn.opensuse.org/viewcvs/yast?rev=55884&view=rev Log: Extended subdomain_profiles agent to convert numerical modes to string and back Better do it by single command on demand, since structure of parsed profile is absolutely undocumented, thus it is virtually impossible to guess on which level of the tree the modes are Modified: trunk/apparmor/src/agents/ag_subdomain_profiles trunk/apparmor/src/include/subdomain/profile_dialogs.ycp Modified: trunk/apparmor/src/agents/ag_subdomain_profiles URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/ag_subdomain_profiles?rev=55884&r1=55883&r2=55884&view=diff ============================================================================== --- trunk/apparmor/src/agents/ag_subdomain_profiles (original) +++ trunk/apparmor/src/agents/ag_subdomain_profiles Tue Mar 3 14:45:26 2009 @@ -127,7 +127,15 @@ } ycp::Return( "true" ); } - } + } elsif ( $command eq "Execute") { + if ( $path eq '.mode_to_string') { + my $ret = Immunix::SubDomain::mode_to_str( $argument ); + ycp::Return($ret); + } + elsif ($path eq '.string_to_mode') { + my $ret = Immunix::SubDomain::str_to_mode( $argument ); + ycp::Return($ret); + } } else { #ycpGetCommand and ycpGetArgType is obsolete, we have those #from ycp::ParseCommand @@ -141,5 +149,5 @@ } } exit 0; - +} Modified: trunk/apparmor/src/include/subdomain/profile_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/include/subdomain/profile_dialogs.ycp?rev=55884&r1=55883&r2=55884&view=diff ============================================================================== --- trunk/apparmor/src/include/subdomain/profile_dialogs.ycp (original) +++ trunk/apparmor/src/include/subdomain/profile_dialogs.ycp Tue Mar 3 14:45:26 2009 @@ -609,7 +609,8 @@ indx = indx+1; }); foreach( string name, map val, (map) paths, { - newlist = add( newlist, `item( `id(indx), name, val["mode"]:0)); + string mode = (string) SCR::Execute(.subdomain_profiles.mode_to_string, val["mode"]:0); + newlist = add( newlist, `item( `id(indx), name, mode)); indx = indx+1; }); map rules = network["rule"]:$[]; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org