SKIP_IINIT_FOR_PASSWORD option for pam user env setup

d-w-moore · d-w-moore · commit eaa5395f006b · 2025-05-08T10:21:26.000-04:00
diff --git a/irods/test/scripts/test_support_functions b/irods/test/scripts/test_support_functions
@@ -114,7 +114,7 @@ _begin_pam_environment_and_password() {
     echo "$ENV" > ~/.irods/irods_environment.json
 
     # TODO: check: it seems /dev/tty won't work if docker exec is not invoked with -t
-    if [ -n "$1" ]; then
+    if [ -n "$1" -a -z "$SKIP_IINIT_FOR_PASSWORD" ]; then
         iinit <<<"$1" 2>/tmp/iinit_as_alice.log
     fi
 }

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ _begin_pam_environment_and_password() {`
`114`	`114`	`echo "$ENV" > ~/.irods/irods_environment.json`
`115`	`115`
`116`	`116`	`# TODO: check: it seems /dev/tty won't work if docker exec is not invoked with -t`
`117`		`- if [ -n "$1" ]; then`
	`117`	`+ if [ -n "$1" -a -z "$SKIP_IINIT_FOR_PASSWORD" ]; then`
`118`	`118`	`iinit <<<"$1" 2>/tmp/iinit_as_alice.log`
`119`	`119`	`fi`
`120`	`120`	`}`