View | Details | Raw Unified | Return to bug 443444
Collapse All | Expand All

(-)/etc/hal/fdi/policy/10osvendor/80-cyberjack.fdi.orig (-4 / +4 lines)
Lines 5-11 Link Here
5 
    <match key="info.subsystem" string="usb_device">
 5 
    <match key="info.subsystem" string="usb_device">
6 
      <match key="usb_device.vendor_id" int="0x0c4b">
 6 
      <match key="usb_device.vendor_id" int="0x0c4b">
7 
        <match key="usb_device.product_id" int="0x0400">
 7 
        <match key="usb_device.product_id" int="0x0400">
8 
	        <merge key="resmgr.class" type="string">usb</merge>
 8 
	        <append key="info.capabilities" type="strlist">smart-card-reader</append>
9 
	      </match>
 9 
	      </match>
10 
      </match>
 10 
      </match>
11 
    </match>
 11 
    </match>
Lines 16-22 Link Here
16 
    <match key="info.subsystem" string="usb_device">
 16 
    <match key="info.subsystem" string="usb_device">
17 
      <match key="usb_device.vendor_id" int="0x0c4b">
 17 
      <match key="usb_device.vendor_id" int="0x0c4b">
18 
        <match key="usb_device.product_id" int="0x0401">
 18 
        <match key="usb_device.product_id" int="0x0401">
19 
	        <merge key="resmgr.class" type="string">usb</merge>
 19 
	        <append key="info.capabilities" type="strlist">smart-card-reader</append>
20 
	      </match>
 20 
	      </match>
21 
      </match>
 21 
      </match>
22 
    </match>
 22 
    </match>
Lines 27-33 Link Here
27 
    <match key="info.subsystem" string="usb_device">
 27 
    <match key="info.subsystem" string="usb_device">
28 
      <match key="usb_device.vendor_id" int="0x0c4b">
 28 
      <match key="usb_device.vendor_id" int="0x0c4b">
29 
        <match key="usb_device.product_id" int="0x0300">
 29 
        <match key="usb_device.product_id" int="0x0300">
30 
	        <merge key="resmgr.class" type="string">usb</merge>
 30 
	        <append key="info.capabilities" type="strlist">smart-card-reader</append>
31 
	      </match>
 31 
	      </match>
32 
      </match>
 32 
      </match>
33 
    </match>
 33 
    </match>
Lines 38-44 Link Here
38 
    <match key="info.subsystem" string="usb_device">
 38 
    <match key="info.subsystem" string="usb_device">
39 
      <match key="usb_device.vendor_id" int="0x0c4b">
 39 
      <match key="usb_device.vendor_id" int="0x0c4b">
40 
        <match key="usb_device.product_id" int="0x0100">
 40 
        <match key="usb_device.product_id" int="0x0100">
41 
	        <merge key="resmgr.class" type="string">usb</merge>
 41 
	        <append key="info.capabilities" type="strlist">smart-card-reader</append>
42 
	      </match>
 42 
	      </match>
43 
      </match>
 43 
      </match>
44 
    </match>
 44 
    </match>
(-)/usr/share/hal/fdi/information/10freedesktop/10-usb-openct.fdi.orig (+6 lines)
Lines 120-125 Link Here
120 
	  <append key="info.addons" type="strlist">hald-addon-openct</append>
 120 
	  <append key="info.addons" type="strlist">hald-addon-openct</append>
121 
	</match>
 121 
	</match>
122 
      </match>
 122 
      </match>
123 
      <match key="usb_device.vendor_id" int="Ox076b">
124 
	<match key="usb_device.product_id" int="0x3821">
125 
	  <merge key="info.category" type="string">smart_card_reader</merge>
126 
	  <append key="info.addons" type="strlist">hald-addon-openct</append>
127 
	</match>
128 
      </match>
123 

          129
          

        

        

          124
          
    </match>

          130
          
    </match>

        

        

          125
          
  </device>

          131
          
  </device>

        



(-)/usr/share/hal/fdi/policy/10osvendor/20-acl-management.fdi.orig
      (+12 lines)




  

    
      
            Lines 90-95
          
      
      
        Link Here
      
    
  

        

          90
          
	<merge key="access_control.type" type="string">fingerprint-reader</merge>

          90
          
	<merge key="access_control.type" type="string">fingerprint-reader</merge>

        

        

          91
          
      </match>

          91
          
      </match>

        

        

          92
          
    </match>

          92
          
    </match>

        

            

              
              
              93
              
    <match key="info.capabilities" contains="usbraw">

            

            

              94
              
      <match key="info.capabilities" sibling_contains="smart_card_reader">

            

            

              95
              
	<append key="info.capabilities" type="strlist">access_control</append>

            

            

              96
              
	<merge key="access_control.file" type="copy_property">usbraw.device</merge>

            

            

              97
              
	<merge key="access_control.type" type="string">smart-card-reader</merge>

            

            

              98
              
      </match>

            

            

              99
              
    </match>

            

        

          93
          

          100
          

        

        

          94
          
    <!-- support for Linux USB stack where linux.device_file is set (e.g. device node is on the main usb device) -->

          101
          
    <!-- support for Linux USB stack where linux.device_file is set (e.g. device node is on the main usb device) -->

        

        

          95
          
    <match key="info.subsystem" string="usb">

          102
          
    <match key="info.subsystem" string="usb">

        

  

    
      
            Lines 119-124
          
      
      
        Link Here
      
    
  

        

          119
          
          <merge key="access_control.type" type="string">fingerprint-reader</merge>

          126
          
          <merge key="access_control.type" type="string">fingerprint-reader</merge>

        

        

          120
          
          <merge key="access_control.file" type="copy_property">@info.parent:linux.device_file</merge>

          127
          
          <merge key="access_control.file" type="copy_property">@info.parent:linux.device_file</merge>

        

        

          121
          
        </match>

          128
          
        </match>

        

            

              
              
              129
              
        <match key="info.capabilities" contains="scanner">

            

            

              130
              
          <append key="info.capabilities" type="strlist">access_control</append>

            

            

              131
              
          <merge key="access_control.type" type="string">smart_card_reader</merge>

            

            

              132
              
          <merge key="access_control.file" type="copy_property">@info.parent:linux.device_file</merge>

            

            

              133
              
        </match>

            

        

          122
          
      </match>

          134
          
      </match>

        

        

          123
          
    </match>

          135
          
    </match>

        

        

          124
          

          136
          

        



(-)/usr/share/PolicyKit/policy/org.freedesktop.hal.device-access.policy.orig
      (+9 lines)




  

    
      
            Lines 190-193
          
      
      
        Link Here
      
    
  

        

          190
          
    </defaults>

          190
          
    </defaults>

        

        

          191
          
  </action>

          191
          
  </action>

        

        

          192
          

          192
          

        

            

              
              
              193
              
  <action id="org.freedesktop.hal.device-access.smart-card-reader">

            

            

              194
              
    <description>Directly access smard card readers</description>

            

            

              195
              
    <message>System policy prevents access to smart card readers</message>

            

            

              196
              
    <defaults>

            

            

              197
              
      <allow_inactive>no</allow_inactive>

            

            

              198
              
      <allow_active>yes</allow_active>

            

            

              199
              
    </defaults>

            

            

              200
              
  </action>

            

            

              201
              

            

        

          193
          
</policyconfig>

          202
          
</policyconfig>

        






  

  Return to bug 443444