summaryrefslogtreecommitdiffstats
path: root/src/sbin
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2009-05-19 01:40:51 +0000
committerNarayan Desai <desai@mcs.anl.gov>2009-05-19 01:40:51 +0000
commit260f66263dbb3104eabb930f86bf1fff02389509 (patch)
tree08bfa8a8fd95f65ae4c5c7424988c4ba0bd34918 /src/sbin
parent229c86e87a277fac5756dd9c33267b4780113198 (diff)
downloadbcfg2-260f66263dbb3104eabb930f86bf1fff02389509.tar.gz
bcfg2-260f66263dbb3104eabb930f86bf1fff02389509.tar.bz2
bcfg2-260f66263dbb3104eabb930f86bf1fff02389509.zip
SSL: Implememt client-side server cN verification
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5244 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/sbin')
-rwxr-xr-xsrc/sbin/bcfg25
1 files changed, 3 insertions, 2 deletions
diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2
index 070561dd9..337bdb888 100755
--- a/src/sbin/bcfg2
+++ b/src/sbin/bcfg2
@@ -46,7 +46,6 @@ class Client:
'quick': Bcfg2.Options.CLIENT_QUICK,
'debug': Bcfg2.Options.DEBUG,
'drivers': Bcfg2.Options.CLIENT_DRIVERS,
- 'fingerprint': Bcfg2.Options.SERVER_FINGERPRINT,
'dryrun': Bcfg2.Options.CLIENT_DRYRUN,
'paranoid': Bcfg2.Options.CLIENT_PARANOID,
'bundle': Bcfg2.Options.CLIENT_BUNDLE,
@@ -72,6 +71,7 @@ class Client:
'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)
@@ -161,7 +161,8 @@ class Client:
self.setup['password'],
key = self.setup['key'],
cert = self.setup['certificate'],
- ca = self.setup['ca'])
+ ca = self.setup['ca'],
+ allowedServerCNs = self.setup['serverCN'])
if self.setup['profile']:
try: