summaryrefslogtreecommitdiffstats
path: root/src/sbin
diff options
context:
space:
mode:
authorSol Jerome <solj@ices.utexas.edu>2010-08-15 01:06:11 +0000
committerSol Jerome <sol.jerome@gmail.com>2010-08-14 21:26:25 -0500
commit8ecabaeb47b2525a7e15504bcc3d9af98210c965 (patch)
tree2428625e46931c623b6dbf7639f832c683e1fb26 /src/sbin
parente1a9bce7c4812eef74ea60788684875996a1a6cf (diff)
downloadbcfg2-8ecabaeb47b2525a7e15504bcc3d9af98210c965.tar.gz
bcfg2-8ecabaeb47b2525a7e15504bcc3d9af98210c965.tar.bz2
bcfg2-8ecabaeb47b2525a7e15504bcc3d9af98210c965.zip
bcfg2: Add back the new SSL key options (Fixes Ticket #916)
The man page no longer contains the -K option mentioned in Ticket #908. This has been removed since [6013]. We still need the key option available in the client to prevent Ticket #916. Signed-off-by: Sol Jerome <sol.jerome@gmail.com> git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@6021 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/sbin')
-rwxr-xr-xsrc/sbin/bcfg27
1 files changed, 4 insertions, 3 deletions
diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2
index 1c66c05b8..073efc302 100755
--- a/src/sbin/bcfg2
+++ b/src/sbin/bcfg2
@@ -69,9 +69,10 @@ class Client:
'filelog': Bcfg2.Options.LOGGING_FILE_PATH,
'decision': Bcfg2.Options.CLIENT_DLIST,
'servicemode': Bcfg2.Options.CLIENT_SERVICE_MODE,
- 'certificate' : Bcfg2.Options.CLIENT_CERT,
- 'ca' : Bcfg2.Options.CLIENT_CA,
- 'serverCN' : Bcfg2.Options.CLIENT_SCNS,
+ 'key': Bcfg2.Options.CLIENT_KEY,
+ 'certificate': Bcfg2.Options.CLIENT_CERT,
+ 'ca': Bcfg2.Options.CLIENT_CA,
+ 'serverCN': Bcfg2.Options.CLIENT_SCNS,
}
self.setup = Bcfg2.Options.OptionParser(optinfo)