Fwd: Another gsi patch

[Robert Olson]

FYI, in case you are trying to use latest LBL CVS pyGlobus. Need these to 
work properly with AG.
--bob

>Date: Fri, 23 Apr 2004 10:39:45 -0500 (CDT)
>From: Robert Olson <olson at mcs.anl.gov>
>To: Matthew Rodriguez DSD staff <mateo at george.lbl.gov>
>cc: Robert Olson <olson at mcs.anl.gov>
>Subject: Another gsi patch
>X-Spam-Status: No, hits=0.0 required=5.0
>         tests=USER_AGENT_PINE
>         version=2.55
>X-Spam-Level:
>X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp)
>X-Whitelist-by-bob: yes
>
>Hi --
>
>Please apply these; they fix some lost ++'s and the condition under which
>the python passphrase parser is invoked.
>--bob
-------------- next part --------------
? build
? d
? gmfh_cache
? tst
? src/ftpClient_wrap.c
? src/ftpControl_wrap.c
? src/gassCopy_wrap.c
? src/gassTransfer_wrap.c
? src/gsi_wrap.c
? src/gss_wrap.c
? src/io_wrap.c
? src/util_wrap.c
Index: src/gsi-3.4.i
===================================================================
RCS file: /home/portnoy/u5/repository/pyGlobus/src/gsi-3.4.i,v
retrieving revision 1.5
diff -c -r1.5 gsi-3.4.i
*** src/gsi-3.4.i	25 Mar 2004 22:46:09 -0000	1.5
--- src/gsi-3.4.i	23 Apr 2004 15:34:52 -0000
***************
*** 221,227 ****
   
          n = PyList_Size(pp);
   
!         for (i = 0; i < n; i  )
          {
              PyObject *d;
              d = PyList_GetItem(pp, i);
--- 221,227 ----
   
          n = PyList_Size(pp);
   
!         for (i = 0; i < n; i++)
          {
              PyObject *d;
              d = PyList_GetItem(pp, i);
***************
*** 255,261 ****
          if (n > (len - 1))
              n = len - 1;
   
!         for (i = 0; i < n; i  )
          {
              PyObject *d;
              long val = 0;
--- 255,261 ----
          if (n > (len - 1))
              n = len - 1;
   
!         for (i = 0; i < n; i++)
          {
              PyObject *d;
              long val = 0;
***************
*** 1100,1106 ****
  	 }
  	
   	
! 	 if (PyCallable_Check(passphraseSpec))
  	 {
  	     /*
  	      * Stash the passphrase information in thread-specific storage.
--- 1100,1106 ----
  	 }
  	
   	
! 	 if (passphraseSpec != Py_None)
  	 {
  	     /*
  	      * Stash the passphrase information in thread-specific storage.
Index: src/gsi-3.5.i
===================================================================
RCS file: /home/portnoy/u5/repository/pyGlobus/src/gsi-3.5.i,v
retrieving revision 1.9
diff -c -r1.9 gsi-3.5.i
*** src/gsi-3.5.i	25 Mar 2004 23:05:02 -0000	1.9
--- src/gsi-3.5.i	23 Apr 2004 15:34:55 -0000
***************
*** 222,228 ****
   
          n = PyList_Size(pp);
   
!         for (i = 0; i < n; i  )
          {
              PyObject *d;
              d = PyList_GetItem(pp, i);
--- 222,228 ----
   
          n = PyList_Size(pp);
   
!         for (i = 0; i < n; i++)
          {
              PyObject *d;
              d = PyList_GetItem(pp, i);
***************
*** 256,262 ****
          if (n > (len - 1))
              n = len - 1;
   
!         for (i = 0; i < n; i  )
          {
              PyObject *d;
              long val = 0;
--- 256,262 ----
          if (n > (len - 1))
              n = len - 1;
   
!         for (i = 0; i < n; i++)
          {
              PyObject *d;
              long val = 0;
***************
*** 1118,1124 ****
  	 }
  	
   	
! 	 if (PyCallable_Check(passphraseSpec))
  	 {
  	     /*
  	      * Stash the passphrase information in thread-specific storage.
--- 1118,1124 ----
  	 }
  	
   	
! 	 if (passphraseSpec != Py_None)
  	 {
  	     /*
  	      * Stash the passphrase information in thread-specific storage.
Index: src/gsi-3.8.i
===================================================================
RCS file: /home/portnoy/u5/repository/pyGlobus/src/gsi-3.8.i,v
retrieving revision 1.8
diff -c -r1.8 gsi-3.8.i
*** src/gsi-3.8.i	30 Mar 2004 00:57:58 -0000	1.8
--- src/gsi-3.8.i	23 Apr 2004 15:34:58 -0000
***************
*** 222,228 ****
   
          n = PyList_Size(pp);
   
!         for (i = 0; i < n; i  )
          {
              PyObject *d;
              d = PyList_GetItem(pp, i);
--- 222,228 ----
   
          n = PyList_Size(pp);
   
!         for (i = 0; i < n; i++)
          {
              PyObject *d;
              d = PyList_GetItem(pp, i);
***************
*** 256,262 ****
          if (n > (len - 1))
              n = len - 1;
   
!         for (i = 0; i < n; i  )
          {
              PyObject *d;
              long val = 0;
--- 256,262 ----
          if (n > (len - 1))
              n = len - 1;
   
!         for (i = 0; i < n; i++)
          {
              PyObject *d;
              long val = 0;
***************
*** 1105,1111 ****
  	    return errTuple;
  	}
  	 	
! 	if (PyCallable_Check(passphraseSpec))
  	{
  	    /*
  	     * Stash the passphrase information in thread-specific storage.
--- 1105,1111 ----
  	    return errTuple;
  	}
  	 	
! 	if (passphraseSpec != Py_None)
  	{
  	    /*
  	     * Stash the passphrase information in thread-specific storage.