summaryrefslogtreecommitdiffstats
path: root/src/sbin
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2011-06-01 09:50:25 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2011-06-01 09:50:46 -0400
commit927f5d957d76f8743b1ae812b5f915588fcb8de6 (patch)
tree3890a6b39d12bd4e84d128e5c3f3a7050c605672 /src/sbin
parent750f1faac80aa97714673abdb435cfb0ede5d734 (diff)
downloadbcfg2-927f5d957d76f8743b1ae812b5f915588fcb8de6.tar.gz
bcfg2-927f5d957d76f8743b1ae812b5f915588fcb8de6.tar.bz2
bcfg2-927f5d957d76f8743b1ae812b5f915588fcb8de6.zip
added -t option to set client timeout
Diffstat (limited to 'src/sbin')
-rwxr-xr-xsrc/sbin/bcfg210
1 files changed, 6 insertions, 4 deletions
diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2
index eb41af640..534ab8238 100755
--- a/src/sbin/bcfg2
+++ b/src/sbin/bcfg2
@@ -75,6 +75,7 @@ class Client:
'certificate': Bcfg2.Options.CLIENT_CERT,
'ca': Bcfg2.Options.CLIENT_CA,
'serverCN': Bcfg2.Options.CLIENT_SCNS,
+ 'timeout': Bcfg2.Options.CLIENT_TIMEOUT,
}
self.setup = Bcfg2.Options.OptionParser(optinfo)
@@ -178,10 +179,11 @@ class Client:
proxy = Bcfg2.Proxy.ComponentProxy(self.setup['server'],
self.setup['user'],
self.setup['password'],
- key = self.setup['key'],
- cert = self.setup['certificate'],
- ca = self.setup['ca'],
- allowedServerCNs = self.setup['serverCN'])
+ key=self.setup['key'],
+ cert=self.setup['certificate'],
+ ca=self.setup['ca'],
+ allowedServerCNs=self.setup['serverCN'],
+ timeout=self.setup['timeout'])
if self.setup['profile']:
try: