Advertisement
rbartl

Untitled

Jan 18th, 2018
75
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.83 KB | None | 0 0
  1. diff --git a/LdapSshGenerator.py b/LdapSshGenerator.py
  2. index 4dc1b52..a7ab234 100755
  3. --- a/LdapSshGenerator.py
  4. +++ b/LdapSshGenerator.py
  5. @@ -53,6 +53,8 @@ class LdapSshGenerator:
  6. sys.exit()
  7. elif o in ("-k", "--key"):
  8. self.project_key = str(a).upper()
  9. + elif o in ("-g", "--adgroup"):
  10. + self.adgroup = str(a).upper()
  11. elif o in ("-p", "--puser"):
  12. self.all_power_user = True
  13. else:
  14. @@ -63,6 +65,9 @@ class LdapSshGenerator:
  15. else:
  16. self.all_power_user = False
  17. self.project_key = project_key
  18. +
  19. + if not self.adgroup:
  20. + self.adgroup = self.project_key
  21.  
  22. # create ldap project search string
  23. # special for msgnc because ldap group does not match with project key
  24. @@ -70,14 +75,14 @@ class LdapSshGenerator:
  25. internal_user_ldap_group = self.project_key[:-2] + self.internal_groups
  26. external_user_ldap_group = self.project_key[:-2] + self.external_groups
  27. else:
  28. - internal_user_ldap_group = self.project_key + self.internal_groups
  29. - external_user_ldap_group = self.project_key + self.external_groups
  30. + internal_user_ldap_group = self.adgroup + self.internal_groups
  31. + external_user_ldap_group = self.adgroup + self.external_groups
  32.  
  33. # get project repository
  34. self.nc_repos.get_project_repo(self.project_key)
  35.  
  36. # handle users
  37. - user_handler = UserHandler(self.project_key, self.tmp_file, self.all_power_user)
  38. + user_handler = UserHandler(self.adgroup, self.tmp_file, self.all_power_user)
  39. current_user = user_handler.get_current_users()
  40. current_user_del = set(user_handler.get_current_users_del())
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement