From 89ca42f2245cf95aae68ed67cf91b56a98ac039a Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Nov 22 2016 21:41:31 +0000
Subject: use grab_session_options everywhere


---

diff --git a/builder/kojid b/builder/kojid
index b5ff393..dc9d635 100755
--- a/builder/kojid
+++ b/builder/kojid
@@ -5074,16 +5074,8 @@ if __name__ == "__main__":
     if options.admin_emails:
         koji.add_mail_logger("koji", options.admin_emails)
 
-    #build session options
-    session_opts = {}
-    for k in ('user', 'password', 'krbservice', 'krb_rdns', 'debug_xmlrpc', 'debug',
-              'retry_interval', 'max_retries', 'offline_retry', 'offline_retry_interval',
-              'keepalive', 'timeout', 'use_fast_upload',
-             ):
-        v = getattr(options, k, None)
-        if v is not None:
-            session_opts[k] = v
     #start a session and login
+    session_opts = koji.grab_session_options(options)
     session = koji.ClientSession(options.server, session_opts)
     if os.path.isfile(options.cert):
         try:
diff --git a/util/koji-shadow b/util/koji-shadow
index a0f7cf4..bd5f967 100755
--- a/util/koji-shadow
+++ b/util/koji-shadow
@@ -1326,9 +1326,7 @@ if __name__ == "__main__":
 
     options, args = get_options()
 
-    session_opts = {}
-    for k in ('user', 'password', 'krbservice', 'debug_xmlrpc', 'debug'):
-        session_opts[k] = getattr(options, k)
+    session_opts = koji.grab_session_options(options)
     session = koji.ClientSession(options.server, session_opts)
     if not options.noauth:
         activate_session(session)
diff --git a/util/kojira b/util/kojira
index 9f776fb..470661b 100755
--- a/util/kojira
+++ b/util/kojira
@@ -791,10 +791,8 @@ if  __name__ == "__main__":
         logger.setLevel(logging.ERROR)
     else:
         logger.setLevel(logging.WARNING)
-    session_opts = {}
-    for k in ('user', 'password', 'krbservice', 'krb_rdns', 'debug_xmlrpc', 'debug',
-              'retry_interval', 'max_retries', 'offline_retry', 'offline_retry_interval'):
-        session_opts[k] = getattr(options,k)
+
+    session_opts = koji.grab_session_options(options)
     session = koji.ClientSession(options.server,session_opts)
     if os.path.isfile(options.cert):
         # authenticate using SSL client certificates
diff --git a/vm/kojivmd b/vm/kojivmd
index 3cce429..373e34f 100755
--- a/vm/kojivmd
+++ b/vm/kojivmd
@@ -1055,14 +1055,8 @@ if __name__ == "__main__":
     if options.admin_emails:
         koji.add_mail_logger("koji", options.admin_emails)
 
-    #build session options
-    session_opts = {}
-    for k in ('user', 'password', 'krbservice', 'krb_rdns', 'debug_xmlrpc', 'debug',
-              'retry_interval', 'max_retries', 'offline_retry', 'offline_retry_interval'):
-        v = getattr(options, k, None)
-        if v is not None:
-            session_opts[k] = v
     #start a session and login
+    session_opts = koji.grab_session_options(options)
     session = koji.ClientSession(options.server, session_opts)
     if os.path.isfile(options.cert):
         try: