[Pubcookie-dev] WEBISO CVS update: ryanc; webiso/pubcookie/src/Win32 PubCookieFilter.cpp,1.2.2.8,1.2.2.9 PubCookieFilter.h,1.1.2.6,1.1.2.7 PubCookieFilter.opt,1.1.2.9,1.1.2.10

[Ryan Campbell]

Update of /usr/local/cvsroot/webiso/pubcookie/src/Win32
 In directory webiso-cvs.cac.washington.edu:/var/tmp/cvs-serv27444
 
 Modified Files:
       Tag: uwash-stable
 	PubCookieFilter.cpp PubCookieFilter.h PubCookieFilter.opt 
 Log Message:
 Fixed pointer math bug in Get_Effective_Values()
 Cleaned up some logging.
 
 



Index: webiso/pubcookie/src/Win32/PubCookieFilter.cpp
diff -c webiso/pubcookie/src/Win32/PubCookieFilter.cpp:1.2.2.8 webiso/pubcookie/src/Win32/PubCookieFilter.cpp:1.2.2.9
*** webiso/pubcookie/src/Win32/PubCookieFilter.cpp:1.2.2.8	Thu Dec 19 15:43:26 2002
--- webiso/pubcookie/src/Win32/PubCookieFilter.cpp	Fri Dec 20 13:26:18 2002
***************
*** 840,848 ****
  
  	strcpy (key, PUBKEY);
  
  	while ( ptr ) { // while we still have more URI left to deal with
  
! 		pachUrl = ptr;
  		ptr = strchr(pachUrl,'/');
  
  		if (ptr) {
--- 840,850 ----
  
  	strcpy (key, PUBKEY);
  
+ 	*ptr--; //to get while loop math correct
+ 
  	while ( ptr ) { // while we still have more URI left to deal with
  
! 		pachUrl = ptr + 1;
  		ptr = strchr(pachUrl,'/');
  
  		if (ptr) {
***************
*** 852,858 ****
  		else {
  			strcpy(szBuff,pachUrl);
  		}
! 
  		if (!strlen(szBuff)) {
  			break;
  		}
--- 854,864 ----
  		else {
  			strcpy(szBuff,pachUrl);
  		}
! /*		if (ptr)
! 				DebugMsg((DEST,"  ptr       : %s\n",ptr));
! 		if (pachUrl)
! 				DebugMsg((DEST,"  pachUrl       : %s\n",pachUrl));
! */
  		if (!strlen(szBuff)) {
  			break;
  		}
***************
*** 863,888 ****
  			if ( stricmp((const char *)szBuff, PBC_NETID_NAME) == 0 ) {
  				dcfg->AuthType = AUTH_NETID;
  				dcfg->legacy = true;
  			}
  			else if ( stricmp((const char *)szBuff, PBC_SECURID_NAME) == 0 ) {
  				dcfg->AuthType = AUTH_SECURID;
  				dcfg->legacy = true;
  			}
  			else if ( stricmp((const char *)szBuff, PBC_PUBLIC_NAME) == 0 ) {
  				dcfg->AuthType = AUTH_NONE;
  				dcfg->Set_Server_Values = true;
  				dcfg->legacy = true;
  			}
  			
- 			DebugMsg((DEST,"  dir type       : %s\n",szBuff));
- 			
  		}
  		
  		strcat (key, szBuff);
- 		strcat (key, "\\");
- 
  		Read_Reg_Values (key, dcfg);
! 
  	}
  
  #  ifndef COOKIE_PATH
--- 869,893 ----
  			if ( stricmp((const char *)szBuff, PBC_NETID_NAME) == 0 ) {
  				dcfg->AuthType = AUTH_NETID;
  				dcfg->legacy = true;
+ 				DebugMsg((DEST,"  Legacy dir type       : %s\n",szBuff));
  			}
  			else if ( stricmp((const char *)szBuff, PBC_SECURID_NAME) == 0 ) {
  				dcfg->AuthType = AUTH_SECURID;
  				dcfg->legacy = true;
+ 				DebugMsg((DEST,"  Legacy dir type       : %s\n",szBuff));
  			}
  			else if ( stricmp((const char *)szBuff, PBC_PUBLIC_NAME) == 0 ) {
  				dcfg->AuthType = AUTH_NONE;
  				dcfg->Set_Server_Values = true;
  				dcfg->legacy = true;
+ 				DebugMsg((DEST,"  Legacy dir type       : %s\n",szBuff));
  			}
  			
  		}
  		
  		strcat (key, szBuff);
  		Read_Reg_Values (key, dcfg);
! 		strcat (key, "\\");
  	}
  
  #  ifndef COOKIE_PATH


Index: webiso/pubcookie/src/Win32/PubCookieFilter.h
diff -c webiso/pubcookie/src/Win32/PubCookieFilter.h:1.1.2.6 webiso/pubcookie/src/Win32/PubCookieFilter.h:1.1.2.7
*** webiso/pubcookie/src/Win32/PubCookieFilter.h:1.1.2.6	Thu Dec 19 15:43:26 2002
--- webiso/pubcookie/src/Win32/PubCookieFilter.h	Fri Dec 20 13:26:18 2002
***************
*** 1,5 ****
  
! #define Pubcookie_Version "Pubcookie ISAPI Filter, 2.7.6"
  
  
  char Instance[3];
--- 1,5 ----
  
! #define Pubcookie_Version "Pubcookie ISAPI Filter, 2.7.7"
  
  
  char Instance[3];


Index: webiso/pubcookie/src/Win32/PubCookieFilter.opt



end of message