ia64/xen-unstable

changeset 5584:d892fbf61323

bitkeeper revision 1.1759 (42c035d96-RzgfZ63O07ihY0xpew2g)

This patch adapts the Java Policy Processor to the default ssid change of
0xfffffff... to 0.

Signed-off by Ray Valdez <rvaldez@us.ibm.com>
author kaf24@firebug.cl.cam.ac.uk
date Mon Jun 27 17:22:33 2005 +0000 (2005-06-27)
parents 4a7652a70a9d
children b08cd3331fdb
files tools/misc/policyprocessor/XmlToBin.java tools/misc/policyprocessor/XmlToBinInterface.java
line diff
     1.1 --- a/tools/misc/policyprocessor/XmlToBin.java	Mon Jun 27 12:59:45 2005 +0000
     1.2 +++ b/tools/misc/policyprocessor/XmlToBin.java	Mon Jun 27 17:22:33 2005 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  /**
     1.5   * (C) Copyright IBM Corp. 2005
     1.6   *
     1.7 - * $Id: XmlToBin.java,v 1.2 2005/06/17 20:00:04 rvaldez Exp $
     1.8 + * $Id: XmlToBin.java,v 1.3 2005/06/20 21:07:37 rvaldez Exp $
     1.9   *
    1.10   * Author: Ray Valdez
    1.11   *
    1.12 @@ -1088,7 +1088,18 @@ public class XmlToBin
    1.13    /* Get VM security information */
    1.14    elementList = root.getElementsByTagName ("VM");
    1.15    printDebug ("\n pDT:: partition length of NodeList:" + elementList.getLength());
    1.16 +  /* Add default Ssid to Ste and Chw bags */			
    1.17 +  SecurityLabel defEntry = new SecurityLabel();
    1.18  
    1.19 +  defEntry.chwTypes = new Vector();
    1.20 +  defEntry.steTypes = new Vector();
    1.21 +  defEntry.chwIDs = new Vector();
    1.22 +  defEntry.ids = new Vector();
    1.23 +
    1.24 +  defEntry.steSsidPosition =0;
    1.25 +  defEntry.chwSsidPosition =0;
    1.26 +  bagOfChwSsids.add(defEntry);
    1.27 +  bagOfSsids.add(defEntry);
    1.28  
    1.29    for (int x = 0; x < elementList.getLength(); x++)
    1.30    {
    1.31 @@ -1326,11 +1337,11 @@ public class XmlToBin
    1.32  	  /* Get vid */
    1.33        	  NodeList elist = e1.getElementsByTagName ("vid");
    1.34        	  String idStr = elist.item(0).getFirstChild().getNodeValue();  
    1.35 -      	  printDebug ("pDTVS:: vid:" + idStr);
    1.36 +      	  printDebug (" pDTVS:: vid:" + idStr);
    1.37  
    1.38  	  /* Get TE */
    1.39        	  elist = e1.getElementsByTagName ("TE");
    1.40 -          printDebug ("pDTVS:: Total ste types: " + elist.getLength());
    1.41 +          printDebug (" pDTVS:: Total ste types: " + elist.getLength());
    1.42  
    1.43  	  Vector colorTypes = new Vector();
    1.44  	  for (int j = 0; j < elist.getLength(); j++)
    1.45 @@ -1396,11 +1407,11 @@ public class XmlToBin
    1.46  	  item.bus = elist.item(0).getFirstChild().getNodeValue();  
    1.47        	  elist = e1.getElementsByTagName ("slot");
    1.48        	  item.slot = elist.item(0).getFirstChild().getNodeValue();  
    1.49 -      	  printDebug ("pDT:: bus and slot:" + item.bus + " "+ item.slot);
    1.50 +      	  printDebug (" pDT:: bus and slot:" + item.bus + " "+ item.slot);
    1.51  
    1.52  	  /* Get TE */
    1.53        	  elist = e1.getElementsByTagName ("TE");
    1.54 -          printDebug ("pDT:: Total ste types: " + elist.getLength());
    1.55 +          printDebug (" pDT:: Total ste types: " + elist.getLength());
    1.56  
    1.57  	  Vector colorTypes = new Vector();
    1.58  	  for (int j = 0; j < elist.getLength(); j++)
    1.59 @@ -1409,7 +1420,7 @@ public class XmlToBin
    1.60          	Node childNode = knode.getFirstChild();     
    1.61          	String value = childNode.getNodeValue();
    1.62  
    1.63 -		printDebug ("pDT:: My color is: " + value);
    1.64 +		printDebug (" pDT:: My color is: " + value);
    1.65  		if (!bagOfTypes.contains(value))
    1.66  		{
    1.67  		  throw new IOException("pDT:: bus: " + item.bus + " slot: "+ item.slot + " has unknown type : "+ value);
     2.1 --- a/tools/misc/policyprocessor/XmlToBinInterface.java	Mon Jun 27 12:59:45 2005 +0000
     2.2 +++ b/tools/misc/policyprocessor/XmlToBinInterface.java	Mon Jun 27 17:22:33 2005 +0000
     2.3 @@ -1,7 +1,7 @@
     2.4  /**
     2.5   * (C) Copyright IBM Corp. 2005
     2.6   *
     2.7 - * $Id: XmlToBinInterface.java,v 1.2 2005/06/17 20:00:04 rvaldez Exp $
     2.8 + * $Id: XmlToBinInterface.java,v 1.3 2005/06/20 21:07:37 rvaldez Exp $
     2.9   *
    2.10   * Author: Ray Valdez
    2.11   *
    2.12 @@ -123,7 +123,7 @@ public interface XmlToBinInterface
    2.13    final short binaryBufferHeaderSz = (3 * u32Size + 4* u16Size);
    2.14  
    2.15    /* copied directlty from policy_ops.h */
    2.16 -  final int POLICY_INTERFACE_VERSION = 0xAAAA0000;
    2.17 +  final int POLICY_INTERFACE_VERSION = 0xAAAA0002;
    2.18  
    2.19    /* copied directly from acm.h */
    2.20    final int ACM_MAGIC  =  0x0001debc;