From 474aa069b71531567537b1a9fd87ff0a2fb9a592 Mon Sep 17 00:00:00 2001
From: Ross Scroggs <ross.scroggs@gmail.com>
Date: Wed, 11 Jun 2025 17:35:50 -0700
Subject: [PATCH] Bug fixes: whatis, print shareddriveorganizers

---
 src/GamUpdate.txt   | 2 ++
 src/gam/__init__.py | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt
index b8aedf1d..009a546f 100644
--- a/src/GamUpdate.txt
+++ b/src/GamUpdate.txt
@@ -2,6 +2,8 @@
 
 Fixed bug in `gam whatis <EmailItem>` where the check for an invitable user always failed.
 
+Fixed bug in `gam print shareddriveorganizers` where no organizers were displayed when `domain` in `gam.cfg` was blank.
+
 7.09.03
 
 Updated `gam <UserTypeEntity> create focustime|outofoffice ... timerange <Time> <Time>` to check
diff --git a/src/gam/__init__.py b/src/gam/__init__.py
index b41af1f5..0f6098bc 100755
--- a/src/gam/__init__.py
+++ b/src/gam/__init__.py
@@ -66178,7 +66178,11 @@ def printSharedDriveOrganizers(users, useDomainAdminAccess=False):
   showNoOrganizerDrives = SHOW_NO_PERMISSIONS_DRIVES_CHOICE_MAP['false']
   fieldsList = ['role', 'type', 'emailAddress']
   cd = entityList = orgUnitId = query = matchPattern = None
-  domainList = [GC.Values[GC.DOMAIN]]
+  domainList = set()
+  if GC.Values[GC.DOMAIN]:
+    domainList.add(GC.Values[GC.DOMAIN])
+  else:
+    domainList.add(GM.Globals[GM.DECODED_ID_TOKEN].get('hd', 'UNKNOWN').lower())
   oneOrganizer = True
   while Cmd.ArgumentsRemaining():
     myarg = getArgument()