diff --git a/src/gam-install.sh b/src/gam-install.sh index ff02161a..e1256cb2 100755 --- a/src/gam-install.sh +++ b/src/gam-install.sh @@ -29,7 +29,7 @@ gamversion="latest" adminuser="" regularuser="" gam_glibc_vers="2.27 2.23" -gam_macos_vers="10.15.4 10.14.6 10.13.6" +gam_macos_vers="10.15.6 10.14.6 10.13.6" while getopts "hd:a:o:b:lp:u:r:v:" OPTION do diff --git a/src/gam/__init__.py b/src/gam/__init__.py index 7a603e93..749b211f 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -8792,6 +8792,12 @@ def doGetUserInfo(user_email=None): print(f' {alias}') if getGroups: throw_reasons = [gapi_errors.ErrorReason.FORBIDDEN] + kwargs = {} + if GC_Values[GC_ENABLE_DASA]: + # Allows groups.list() to function but will limit + # returned groups to those in same domain as user + # so only do this for DASA admins + kwargs['domain'] = GC_Values[GC_DOMAIN] try: groups = gapi.get_all_pages( cd.groups(), @@ -8799,7 +8805,7 @@ def doGetUserInfo(user_email=None): 'groups', userKey=user_email, fields='groups(name,email),nextPageToken', - throw_reasons=throw_reasons) + throw_reasons=throw_reasons, **kwargs) if groups: print(f'Groups: ({len(groups)})') for group in groups: