*** check_oracle.original	Mon Dec  9 15:57:44 2002
--- check_oracle	Mon Dec  9 16:24:28 2002
***************
*** 36,41 ****
--- 36,42 ----
    echo "Usage:"
    echo "  $PROGNAME --tns <Oracle Sid or Hostname/IP address>"
    echo "  $PROGNAME --db <ORACLE_SID>"
+   echo "  $PROGNAME --login <ORACLE_SID>"
    echo "  $PROGNAME --oranames <Hostname>"
    echo "  $PROGNAME --help"
    echo "  $PROGNAME --version"
***************
*** 53,58 ****
--- 54,61 ----
    echo "--db=SID"
    echo "   Check local database (search /bin/ps for PMON process and check"
  	echo "   filesystem for sgadefORACLE_SID.dbf"
+   echo "--login=SID"
+   echo "   Attempt a dummy login and alert if not ORA-01017: invalid username/password"
    echo "--oranames=Hostname"
    echo "   Check remote Oracle Names server"
    echo "--help"
***************
*** 81,86 ****
--- 84,109 ----
      ;;
  esac
  
+ # Information options
+ case "$cmd" in
+ --help)
+ 		print_help
+     exit $STATE_OK
+     ;;
+ -h)
+ 		print_help
+     exit $STATE_OK
+     ;;
+ --version)
+ 		print_revision $PLUGIN $REVISION
+     exit $STATE_OK
+     ;;
+ -V)
+ 		print_revision $PLUGIN $REVISION
+     exit $STATE_OK
+     ;;
+ esac
+ 
  # Hunt down a reasonable ORACLE_HOME
  if [ -z "$ORACLE_HOME" ] ; then
  	# Adjust to taste
***************
*** 156,177 ****
  	exit $STATE_CRITICAL
      fi
      ;;
! --help)
! 		print_help
!     exit $STATE_OK
      ;;
- -h)
- 		print_help
-     exit $STATE_OK
-     ;;
- --version)
- 		print_revision $PLUGIN $REVISION
-     exit $STATE_OK
-     ;;
- -V)
- 		print_revision $PLUGIN $REVISION
-     exit $STATE_OK
-     ;;
  *)
      print_usage
  		exit $STATE_UNKNOWN
--- 179,196 ----
  	exit $STATE_CRITICAL
      fi
      ;;
! --login)
!     loginchk=`sqlplus dummy/user@$2 < /dev/null`
!     loginchk2=` echo  $loginchk | grep -c ORA-01017`
!     if [ ${loginchk2} -eq 1 ] ; then 
! 	echo "OK - dummy login connected"
! 	exit $STATE_OK
!     else
! 	loginchk3=` echo "$loginchk" | grep "ORA-" | head -1`
! 	echo "CRITICAL - $loginchk3"
! 	exit $STATE_CRITICAL
!     fi
      ;;
  *)
      print_usage
  		exit $STATE_UNKNOWN