[Ltp-cvs] ltp/testcases/kernel/security/selinux-testsuite/tests/shm selinux_shm.sh,1.2,1.3 selinux_shmat.c,1.2,1.3 selinux_shmctl.c,1.1,1.2 selinux_shmget.c,1.2,1.3

[Martin R. <mr...@us...>]

Update of /cvsroot/ltp/ltp/testcases/kernel/security/selinux-testsuite/tests/shm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22391/selinux-testsuite/tests/shm

Modified Files:
	selinux_shm.sh selinux_shmat.c selinux_shmctl.c 
	selinux_shmget.c 
Log Message:
Security test updates from Joy

Index: selinux_shmctl.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/security/selinux-testsuite/tests/shm/selinux_shmctl.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** selinux_shmctl.c	20 Apr 2005 16:09:15 -0000	1.1
--- selinux_shmctl.c	8 Nov 2005 16:49:35 -0000	1.2
***************
*** 9,12 ****
--- 9,13 ----
   */
  
+ #include <unistd.h>
  #include <sys/types.h>
  #include <stdio.h>
***************
*** 17,21 ****
  int main(int argc, char **argv)
  {
! 	char ch;
  	int num = 1;
  	int key = 0x8888;
--- 18,22 ----
  int main(int argc, char **argv)
  {
! 	int ch;
  	int num = 1;
  	int key = 0x8888;
***************
*** 24,29 ****
  	struct shmid_ds buf;
  
! 	while ((ch = getopt(argc, argv, "k:-n:")) != EOF) {
! 		switch (ch) {
  		case 'k':
  			key = atoi(optarg);
--- 25,30 ----
  	struct shmid_ds buf;
  
! 	while ((ch = getopt(argc, argv, "k:-n:")) != -1) {
! 		switch ((char)ch) {
  		case 'k':
  			key = atoi(optarg);

Index: selinux_shmget.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/security/selinux-testsuite/tests/shm/selinux_shmget.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** selinux_shmget.c	14 Jun 2005 13:07:04 -0000	1.2
--- selinux_shmget.c	8 Nov 2005 16:49:35 -0000	1.3
***************
*** 9,12 ****
--- 9,13 ----
   */
  
+ #include <unistd.h>
  #include <sys/types.h>
  #include <stdio.h>
***************
*** 22,27 ****
  	int id;
  
! 	while ((ch = getopt(argc, argv, "k:-n:")) != EOF) {
! 		switch (ch) {
  		case 'k':
  			key = atoi(optarg);
--- 23,28 ----
  	int id;
  
! 	while ((ch = getopt(argc, argv, "k:-n:")) != -1) {
! 		switch ((char)ch) {
  		case 'k':
  			key = atoi(optarg);

Index: selinux_shmat.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/security/selinux-testsuite/tests/shm/selinux_shmat.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** selinux_shmat.c	14 Jun 2005 13:07:03 -0000	1.2
--- selinux_shmat.c	8 Nov 2005 16:49:35 -0000	1.3
***************
*** 9,12 ****
--- 9,13 ----
   */
  
+ #include <unistd.h>
  #include <sys/types.h>
  #include <stdio.h>
***************
*** 24,29 ****
  	char *buf;
  
! 	while ((ch = getopt(argc, argv, "k:-n:")) != EOF) {
! 		switch (ch) {
  		case 'k':
  			key = atoi(optarg);
--- 25,30 ----
  	char *buf;
  
! 	while ((ch = getopt(argc, argv, "k:-n:")) != -1) {
! 		switch ((char)ch) {
  		case 'k':
  			key = atoi(optarg);

Index: selinux_shm.sh
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/security/selinux-testsuite/tests/shm/selinux_shm.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** selinux_shm.sh	14 Jul 2005 18:21:37 -0000	1.2
--- selinux_shm.sh	8 Nov 2005 16:49:35 -0000	1.3
***************
*** 16,20 ****
  setup()
  {
- 	LTPTMP="/tmp/selinux"
  	export TCID="setup"
  	export TST_COUNT=0
--- 16,19 ----
***************
*** 33,39 ****
  	if [ $RC -eq 0 ]
  	then
! 		tst_resm TPASS "Test #1: shm passed."
  	else
! 		tst_resm TFAIL "Test #1: shm failed."
  		return $RC
  	fi
--- 32,38 ----
  	if [ $RC -eq 0 ]
  	then
! 		echo "$TCID   PASS : shm passed."
  	else
! 		echo "$TCID   FAIL : shm failed."
  		return $RC
  	fi
***************
*** 42,46 ****
  	if [ ! $ipcid ]
  	then
! 		tst_brk TBROK "Test #1: Invalid output from selinux_shmget."
  	fi
  	return $RC
--- 41,45 ----
  	if [ ! $ipcid ]
  	then
! 		echo "$TCID: Invalid output from selinux_shmget."
  	fi
  	return $RC
***************
*** 58,64 ****
  	if [ $RC -eq 0 ]
  	then
! 		tst_resm TPASS "Test #2: shm passed."
  	else
! 		tst_resm TFAIL "Test #2: shm failed."
  	fi
  	return $RC
--- 57,63 ----
  	if [ $RC -eq 0 ]
  	then
! 		echo "$TCID   PASS : shm passed."
  	else
! 		echo "$TCID   FAIL : shm failed."
  	fi
  	return $RC
***************
*** 76,82 ****
  	if [ $RC -eq 0 ]
  	then
! 		tst_resm TPASS "Test #3: shm passed."
  	else
! 		tst_resm TFAIL "Test #3: shm failed."
  		return $RC
  	fi
--- 75,81 ----
  	if [ $RC -eq 0 ]
  	then
! 		echo "$TCID   PASS : shm passed."
  	else
! 		echo "$TCID   FAIL : shm failed."
  		return $RC
  	fi
***************
*** 85,89 ****
  	if [ ! $ipcid ]
  	then
! 		tst_brk TBROK "Test #3: Invalid output from selinux_shmget."
  	fi
  	return $RC
--- 84,88 ----
  	if [ ! $ipcid ]
  	then
! 		echo "$TCID: Invalid output from selinux_shmget."
  	fi
  	return $RC
***************
*** 101,107 ****
  	if [ $RC -eq 0 ]
  	then
! 		tst_resm TPASS "Test #4: shm passed."
  	else
! 		tst_resm TFAIL "Test #4: shm failed."
  		return $RC
  	fi
--- 100,106 ----
  	if [ $RC -eq 0 ]
  	then
! 		echo "$TCID   PASS : shm passed."
  	else
! 		echo "$TCID   FAIL : shm failed."
  		return $RC
  	fi
***************
*** 110,114 ****
  	if [ ! $ipcid2 ]
  	then
! 		tst_brk TBROK "Test #4: Invalid output from selinux_shmget."
  	fi
  	return $RC
--- 109,113 ----
  	if [ ! $ipcid2 ]
  	then
! 		echo "$TCID: Invalid output from selinux_shmget."
  	fi
  	return $RC
***************
*** 124,131 ****
  	if [ $ipcid2 = $ipcid ]
  	then
! 		tst_resm TPASS "Test #5: shm passed."
  		RC=0
  	else
! 		tst_resm TFAIL "Test #5: shm failed."
  		RC=1
  	fi
--- 123,130 ----
  	if [ $ipcid2 = $ipcid ]
  	then
! 		echo "$TCID   PASS : shm passed."
  		RC=0
  	else
! 		echo "$TCID   FAIL : shm failed."
  		RC=1
  	fi
***************
*** 144,151 ****
  	if [ $RC -ne 0 ]
  	then
! 		tst_resm TPASS "Test #6: shm passed."
  		RC=0
  	else
! 		tst_resm TFAIL "Test #6: shm failed."
  		RC=1	
  	fi
--- 143,150 ----
  	if [ $RC -ne 0 ]
  	then
! 		echo "$TCID   PASS : shm passed."
  		RC=0
  	else
! 		echo "$TCID   FAIL : shm failed."
  		RC=1	
  	fi
***************
*** 177,184 ****
          if [ $result = "-$number" ]
          then
!                 tst_resm TPASS "Test #7: shm passed."
                  RC=0
          else
!                 tst_resm TFAIL "Test #7: shm failed."
                  RC=1
          fi
--- 176,183 ----
          if [ $result = "-$number" ]
          then
!                 echo "$TCID   PASS : shm passed."
                  RC=0
          else
!                 echo "$TCID   FAIL : shm failed."
                  RC=1
          fi
***************
*** 203,210 ****
          if [ $result = 0 ]
          then
!                 tst_resm TPASS "Test #8: shm passed."
                  RC=0
          else
!                 tst_resm TFAIL "Test #8: shm failed."
                  RC=1
          fi
--- 202,209 ----
          if [ $result = 0 ]
          then
!                 echo "$TCID   PASS : shm passed."
                  RC=0
          else
!                 echo "$TCID   FAIL : shm failed."
                  RC=1
          fi
***************
*** 227,233 ****
  	if [ $RC -eq 0 ]
  	then
! 		tst_resm TPASS "Test #9: shm passed."
  	else
! 		tst_resm TFAIL "Test #9: shm failed."
  	fi
  	return $RC
--- 226,232 ----
  	if [ $RC -eq 0 ]
  	then
! 		echo "$TCID   PASS : shm passed."
  	else
! 		echo "$TCID   FAIL : shm failed."
  	fi
  	return $RC
***************
*** 244,251 ****
  	if [ $RC -ne 0 ]
  	then
! 		tst_resm TPASS "Test #10: shm passed."
  		RC=0
  	else
! 		tst_resm TFAIL "Test #10: shm failed."
  		RC=1
  	fi
--- 243,250 ----
  	if [ $RC -ne 0 ]
  	then
! 		echo "$TCID   PASS : shm passed."
  		RC=0
  	else
! 		echo "$TCID   FAIL : shm failed."
  		RC=1
  	fi
***************
*** 261,265 ****
  	if [ ! $ipcid ]
  	then
! 		tst_resm TINFO "cleanup: Invalid output from selinux_shmget."
  	fi
  	runcon -t test_ipc_base_t ipcrm shm $ipcid
--- 260,264 ----
  	if [ ! $ipcid ]
  	then
! 		echo "cleanup: Invalid output from selinux_shmget."
  	fi
  	runcon -t test_ipc_base_t ipcrm shm $ipcid