Merge lp:~jeff-apple/openvista-gtm-integration/bug385767 into lp:openvista-gtm-integration

[jeff.apple]

[jeff.apple (jeff-apple)]

All of the changes are in revision 68. Rev 66 is a bad set of changes. Rev 67 reverts them.

[Jon Tai (jontai)]

review: Approve

=== modified file 'mumps/ZOSVGUX.m'
--- mumps/ZOSVGUX.m	2009-06-17 16:57:13 +0000
+++ mumps/ZOSVGUX.m	2009-06-24 03:19:27 +0000
@@ -1,4 +1,4 @@
-%ZOSV ;SFISC/AC,PUG/TOAD,HOU/DHW,MSC/JDA/JKT - View commands & special functions. ;11JUN2009
+%ZOSV ;SFISC/AC,PUG/TOAD,HOU/DHW,MSC/JDA/JKT - View commands & special functions. ;23JUN2009
  ;;8.0;KERNEL;**275,MSC**;Jul 10, 1995
  ;
 ACTJ() ; # active jobs
@@ -43,16 +43,9 @@
  S A="LOGDEV" OPEN A:(COMM=CMD)::"PIPE" U A C A
  Q
 PRGMODE ; <=====
- N USER,PASS,ISOK,LOGTEXT,RDIR
- D INITKB^XGF()
- W !,"System user name: "
- S USER=$$READ^XGF() Q:USER="^"
- X ^%ZOSF("EOFF")
- W !,"System password: "
- S PASS=$$READ^XGF()
- X ^%ZOSF("EON") Q:PASS=U
- W !
- S ISOK=$$AUTH(USER,PASS)
+ N USER,ISOK,LOGTEXT,RDIR
+ S ISOK=$$AUTH(.USER)
+ Q:USER="^"
  S RDIR=$$RTNDIR^%ZOSV
  S LOGTEXT=$S(ISOK:"Granted",1:"Denied")_" programmer mode in "
  S LOGTEXT=LOGTEXT_$P(RDIR,"/",$L(RDIR,"/")-2) ; instance
@@ -70,7 +63,19 @@
 PROGMODE() ; <=====
  Q 1 ; until we fix this, we're never in application mode
  ;
-AUTH(USER,PASS) ;
+AUTH(USER) ;
+ N PASS
+ N IDDEV S IDDEV="id",OLDIO=$IO
+ O IDDEV:(COMMAND="id -un":READONLY)::"PIPE" U IDDEV R USER C IDDEV U OLDIO
+ Q:USER'="openvista" 1
+ D INITKB^XGF()
+ W !,"System user name: "
+ S USER=$$READ^XGF() Q:USER="^" 0
+ X ^%ZOSF("EOFF")
+ W !,"System password: "
+ S PASS=$$READ^XGF()
+ X ^%ZOSF("EON") I PASS="^" S USER="^" Q 0
+ W !
  N DEV,OLDIO,STATUS
  S DEV="ovauth",OLDIO=$IO,STATUS="Problem opening pipe"
  O DEV:(COMMAND="/sbin/ovauth "_USER:PARSE:INDEPENDENT:EXCEPTION="G AUTHDONE")::"PIPE"
@@ -78,6 +83,7 @@
 AUTHDONE
  U OLDIO
  C DEV
+ ; W STATUS,! ; Comment this back in to see what went wrong
  Q STATUS="OK"
 UCI ;
  S Y=^%ZOSF("PROD") Q