[pywin32-checkins] pywin32/win32/src win32security.i,1.30,1.31 win32security_sspi.cpp,1.5,1.6

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32/win32/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17839/win32/src

Modified Files:
	win32security.i win32security_sspi.cpp 
Log Message:
Use more consistent naming conventions for SSPI type objects

Index: win32security_sspi.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32security_sspi.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** win32security_sspi.cpp	12 Feb 2006 09:35:06 -0000	1.5
--- win32security_sspi.cpp	13 Feb 2006 14:42:35 -0000	1.6
***************
*** 73,77 ****
  
  // @object PySecBufferDesc|Sequence-like object that contains a group of buffers to be used with SSPI functions.
! // @comm This object is created using win32security.SecBufferDescType(Version), where Version is an int that
  // defaults to SECBUFFER_VERSION if not passed in.
  struct PyMethodDef PySecBufferDesc::methods[] = {
--- 73,77 ----
  
  // @object PySecBufferDesc|Sequence-like object that contains a group of buffers to be used with SSPI functions.
! // @comm This object is created using win32security.PySecBufferDescType(Version), where Version is an int that
  // defaults to SECBUFFER_VERSION if not passed in.
  struct PyMethodDef PySecBufferDesc::methods[] = {
***************
*** 292,296 ****
  
  // @object PySecBuffer|Python object wrapping a SecBuffer structure
! //  Created using win32security.SecBufferType(type,size) where type is a SECBUFFER_* constant
  struct PyMethodDef PySecBuffer::methods[] = {
  	{"Clear",     PySecBuffer::Clear, 1}, 	// @pymeth Clear|Resets all members of the structure
--- 292,296 ----
  
  // @object PySecBuffer|Python object wrapping a SecBuffer structure
! //  Created using win32security.PySecBufferType(type,size) where type is a SECBUFFER_* constant
  struct PyMethodDef PySecBuffer::methods[] = {
  	{"Clear",     PySecBuffer::Clear, 1}, 	// @pymeth Clear|Resets all members of the structure
***************
*** 487,491 ****
  ////////////////////////////////////////////////////////////////////////
  // @object PyCtxtHandle|Security context handle, as used with sspi functions
! // @comm Create using win32security.CtxtHandleType().  The handle must be initialized by passing it to 
  // <om win32security.InitializeSecurityContext> or <om win32security.AcceptSecurityContext>
  struct PyMethodDef PyCtxtHandle::methods[] = {
--- 487,491 ----
  ////////////////////////////////////////////////////////////////////////
  // @object PyCtxtHandle|Security context handle, as used with sspi functions
! // @comm Create using win32security.PyCtxtHandleType().  The handle must be initialized by passing it to 
  // <om win32security.InitializeSecurityContext> or <om win32security.AcceptSecurityContext>
  struct PyMethodDef PyCtxtHandle::methods[] = {
***************
*** 1051,1055 ****
  // @object PyCredHandle|Handle to a set of logon credentials, used with sspi authentication functions
  // @comm This object is usually created using <om win32security.AcquireCredentialsHandle>.
! // An uninitialized handle can also be created using win32security.CredHandleType()
  struct PyMethodDef PyCredHandle::methods[] = {
  	{"Detach",     PyCredHandle::Detach, 1}, 	// @pymeth Detach|Disassociates object from handle and returns integer value of handle (prevents automatic freeing of credentials when object is deallocated), 
--- 1051,1055 ----
  // @object PyCredHandle|Handle to a set of logon credentials, used with sspi authentication functions
  // @comm This object is usually created using <om win32security.AcquireCredentialsHandle>.
! // An uninitialized handle can also be created using win32security.PyCredHandleType()
  struct PyMethodDef PyCredHandle::methods[] = {
  	{"Detach",     PyCredHandle::Detach, 1}, 	// @pymeth Detach|Disassociates object from handle and returns integer value of handle (prevents automatic freeing of credentials when object is deallocated), 

Index: win32security.i
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32security.i,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** win32security.i	12 Feb 2006 09:47:43 -0000	1.30
--- win32security.i	13 Feb 2006 14:42:35 -0000	1.31
***************
*** 671,679 ****
  	pfnDsGetDcName=(DsGetDcNamefunc)loadapifunc("DsGetDcNameW", netapi32_dll);
  	
  	PyDict_SetItemString(d, "SecBufferType", (PyObject *)&PySecBufferType);
  	PyDict_SetItemString(d, "SecBufferDescType", (PyObject *)&PySecBufferDescType);
  	PyDict_SetItemString(d, "CtxtHandleType", (PyObject *)&PyCtxtHandleType);
  	PyDict_SetItemString(d, "CredHandleType", (PyObject *)&PyCredHandleType);
!     
      // Patch up any kwarg functions - SWIG doesn't like them.
      for (PyMethodDef *pmd = win32securityMethods;pmd->ml_name;pmd++)
--- 671,685 ----
  	pfnDsGetDcName=(DsGetDcNamefunc)loadapifunc("DsGetDcNameW", netapi32_dll);
  	
+ 	// old names, these should not be used
  	PyDict_SetItemString(d, "SecBufferType", (PyObject *)&PySecBufferType);
  	PyDict_SetItemString(d, "SecBufferDescType", (PyObject *)&PySecBufferDescType);
  	PyDict_SetItemString(d, "CtxtHandleType", (PyObject *)&PyCtxtHandleType);
  	PyDict_SetItemString(d, "CredHandleType", (PyObject *)&PyCredHandleType);
! 	// aliases with correct naming conventions
! 	PyDict_SetItemString(d, "PySecBufferType", (PyObject *)&PySecBufferType);
! 	PyDict_SetItemString(d, "PySecBufferDescType", (PyObject *)&PySecBufferDescType);
! 	PyDict_SetItemString(d, "PyCtxtHandleType", (PyObject *)&PyCtxtHandleType);
! 	PyDict_SetItemString(d, "PyCredHandleType", (PyObject *)&PyCredHandleType);
! 
      // Patch up any kwarg functions - SWIG doesn't like them.
      for (PyMethodDef *pmd = win32securityMethods;pmd->ml_name;pmd++)