[Luma-commit] luma/lib/luma/base/gui ServerDialog.py,1.26,1.27

[Wido D. <wi...@us...>]

Update of /cvsroot/luma/luma/lib/luma/base/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30476/lib/luma/base/gui

Modified Files:
	ServerDialog.py 
Log Message:
Added code for client side certs.

Index: ServerDialog.py
===================================================================
RCS file: /cvsroot/luma/luma/lib/luma/base/gui/ServerDialog.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** ServerDialog.py	26 Jul 2005 14:32:29 -0000	1.26
--- ServerDialog.py	15 Aug 2005 13:51:45 -0000	1.27
***************
*** 131,135 ****
              self.encryptionBox.setCurrentItem(2)
              self.validateBox.setEnabled(True)
!             self.useClientCertBox.setEnabled(False)
              
          if x.checkServerCertificate == u"never":
--- 131,135 ----
              self.encryptionBox.setCurrentItem(2)
              self.validateBox.setEnabled(True)
!             self.useClientCertBox.setEnabled(True)
              
          if x.checkServerCertificate == u"never":
***************
*** 143,146 ****
--- 143,149 ----
              
          self.useClientCertBox.setChecked(x.useCertificate)
+         self.certFileEdit.setText(x.clientCertFile)
+         self.certKeyfileEdit.setText(x.clientCertKeyfile)
+         
          self.enableClientCertWidgets(x.useCertificate)
          
***************
*** 472,475 ****
--- 475,479 ----
          # Now do internal stuff like updating the ServerObject 
          # and activate apply button
+         self.currentServer.clientCertFile = tmpFileName
          self.applyButton.setEnabled(True)
          
***************
*** 502,505 ****
--- 506,510 ----
          # Now do internal stuff like updating the ServerObject 
          # and activate apply button
+         self.currentServer.clientCertKeyfile = tmpFileName
          self.applyButton.setEnabled(True)
          
***************
*** 588,592 ****
  
      def enableClientCerts(self, toggleBool):
!         self.currentServer.useCertificate = toggleBool
          self.applyButton.setEnabled(True)
          self.enableClientCertWidgets(toggleBool)
--- 593,601 ----
  
      def enableClientCerts(self, toggleBool):
!         if toggleBool >= 1:
!             self.currentServer.useCertificate = True
!         else:
!             self.currentServer.useCertificate = False
!             
          self.applyButton.setEnabled(True)
          self.enableClientCertWidgets(toggleBool)