Changeset 2251

Show
Ignore:
Timestamp:
06/27/08 15:13:18 (2 months ago)
Author:
dsugar
Message:

Cleanup

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/test/test0119/expected.te

    r2186 r2251  
    4444        allow server_t tmp_t:dir { search }; 
    4545# CDSFramework access (domain baseresource verb): server selinux read 
     46seutil_read_config(server_t) 
    4647selinux_getattr_fs(server_t) 
    4748selinux_validate_context(server_t) 
    48 seutil_read_config(server_t) 
    4949# CDSFramework access (domain baseresource verb): server terminal readwrite 
    5050term_use_all_user_ptys(server_t) 

  • trunk/test/test0121/expected.te

    r2186 r2251  
    4141        allow client_t tmp_t:dir { search }; 
    4242# CDSFramework access (domain baseresource verb): client selinux read 
     43seutil_read_config(client_t) 
    4344selinux_getattr_fs(client_t) 
    4445selinux_validate_context(client_t) 
    45 seutil_read_config(client_t) 
    4646# CDSFramework access (domain baseresource verb): client sysnetwork read 
    4747sysnet_read_config(client_t) 

  • trunk/test/test0134/expected.fnet

    r2195 r2251  
    11system lowside; 
    22system highside; 
    3 networkresource guard_out {ipsec ( 3des-blowfish "KO6=3PV0F:K4MRM<387XAYAV" )  ( hmac-md5 ":9F=TO@EY>S<YL@WPY=<" )  }; 
    4 networkresource guard_in {secmark }; 
     3networkresource guard_out { ipsec ( 3des-cbc "KO6=3PV0F:K4MRM<387XAYAV" )  ( hmac-md5 ":9F=TO@EY>S<YL@WPY=<" )  }; 
     4networkresource guard_in { secmark }; 
    55connection highside.server_domain { 192.168.0.1 80  } lowside.client_domain { 192.168.0.100 255  } guard_out { 90 }; 
    66connection lowside.client_domain { 192.168.0.100 255  } highside.server_domain { 192.168.0.1 80  } guard_out { 95 }; 

  • trunk/test/test0134/test.sh

    r2212 r2251  
    44 
    55RESULT=0 
    6  
    7 diff_fnet_files() 
    8 { 
    9         expected_output=$DIR/expected.fnet 
    10         generated_output=$DIR/test.fnet 
    11         diff_file=$DIR/test.diff 
    12         `diff --ignore-matching-lines="networkresource guard_out {ipsec ( 3des.*"  $expected_output $generated_output > $diff_file`  
    13         if [ -e $diff_file ]; then 
    14                 different_lines=`wc -l $diff_file | cut -f 1 -d ' '` 
    15                 if [ $different_lines -gt 0 ]; then 
    16                         RESULT=1 
    17                 fi; 
    18         else 
    19                 RESULT=1 
    20         fi; 
    21 } 
    226 
    237#run the compiler test 
    …… 
    3014        RESULT=1 
    3115fi; 
    32  
    33  
    3416 
    3517#verify the error output is empty 
    …… 
    5335                RESULT=1 
    5436        fi; 
    55          
    56         if [ $RESULT -ne 1 ]; then 
    57                 diff_fnet_files 
     37fi; 
     38 
     39if [ $RESULT -eq 0 ]; then  
     40        diff $DIR/test.fnet $DIR/expected.fnet >> /dev/null 
     41        if [ $? -ne 0 ]; then 
     42                RESULT=1 
     43                echo Unexpected results from fnet comparison 
    5844        fi; 
    5945fi;