[Firebird-checkins] CVS: interbase/utilities dba.e,1.4,1.5 dba_full.e,1.1.1.1,1.2 sbc_print.c,1.1.1.1,1.2 security.e,1.1.1.1,1.2

[Mark O. <sky...@us...>]

Update of /cvsroot/firebird/interbase/utilities
In directory usw-pr-cvs1:/tmp/cvs-serv32292/utilities

Modified Files:
	dba.e dba_full.e sbc_print.c security.e 
Log Message:
Committed Changes made in the borland tree
Committed Changes made by Mike Nordel re, 64 bit io for win32 and bug fixes


Index: dba.e
===================================================================
RCS file: /cvsroot/firebird/interbase/utilities/dba.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** dba.e	2000/10/12 02:52:18	1.4
--- dba.e	2001/04/05 17:05:43	1.5
***************
*** 1932,1935 ****
--- 1932,1936 ----
  DBA_FIL	fil;
  TDBA	tddba;
+ LARGE_INTEGER liOffset;
  
  tddba = GET_THREAD_DATA;
***************
*** 1944,1948 ****
  
  page_number -= fil->fil_min_page - fil->fil_fudge;
! if (SetFilePointer (fil->fil_desc, (ULONG) (page_number * tddba->page_size), NULL, FILE_BEGIN) == -1)
      {
  #ifdef SUPERSERVER
--- 1945,1950 ----
  
  page_number -= fil->fil_min_page - fil->fil_fudge;
! liOffset.QuadPart = UInt32x32To64((DWORD)page_number, (DWORD)tddba->page_size);
! if (SetFilePointer (fil->fil_desc, (LONG)liOffset.LowPart, &liOffset.HighPart, FILE_BEGIN) == -1)
      {
  #ifdef SUPERSERVER

Index: dba_full.e
===================================================================
RCS file: /cvsroot/firebird/interbase/utilities/dba_full.e,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** dba_full.e	2000/08/03 20:54:25	1.1.1.1
--- dba_full.e	2001/04/05 17:05:43	1.2
***************
*** 1617,1620 ****
--- 1617,1621 ----
  FIL	fil;
  TDBA	tddba;
+ LARGE_INTEGER liOffset;
  
  tddba = GET_THREAD_DATA;
***************
*** 1624,1628 ****
  
  page_number -= fil->fil_min_page - fil->fil_fudge;
! if (SetFilePointer (fil->fil_desc, (ULONG) (page_number * tddba->page_size), NULL, FILE_BEGIN) == -1)
      db_error (GetLastError());
  
--- 1625,1630 ----
  
  page_number -= fil->fil_min_page - fil->fil_fudge;
! liOffset.QuadPart = UInt32x32To64((DWORD)page_number, (DWORD)tddba->page_size);
! if (SetFilePointer (fil->fil_desc, (LONG)liOffset.LowPart, &liOffset.HighPart, FILE_BEGIN) == -1)
      db_error (GetLastError());
  

Index: sbc_print.c
===================================================================
RCS file: /cvsroot/firebird/interbase/utilities/sbc_print.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** sbc_print.c	2000/08/03 20:54:29	1.1.1.1
--- sbc_print.c	2001/04/05 17:05:43	1.2
***************
*** 675,680 ****
   **************************************/
  SLONG	actual_length;
  
! if (SetFilePointer (file, (ULONG) (page_number * page_size), NULL, FILE_BEGIN) == -1)
      db_error (GetLastError());
  
--- 675,682 ----
   **************************************/
  SLONG	actual_length;
+ LARGE_INTEGER liOffset;
  
! liOffset.QuadPart = UInt32x32To64((DWORD)page_number, (DWORD)page_size);
! if (SetFilePointer (file, (LONG)liOffset.LowPart, &liOffset.HighPart, FILE_BEGIN) == -1)
      db_error (GetLastError());
  

Index: security.e
===================================================================
RCS file: /cvsroot/firebird/interbase/utilities/security.e,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** security.e	2000/08/03 20:54:29	1.1.1.1
--- security.e	2001/04/05 17:05:43	1.2
***************
*** 38,41 ****
--- 38,42 ----
  
  #define MAX_PASSWORD_LENGTH	31
+ #define SYSDBA_USER_NAME	"SYSDBA"
  
  SSHORT SECURITY_exec_line (
***************
*** 264,277 ****
  
  	found = FALSE;
! 	FOR U IN USERS WITH U.USER_NAME EQ user_data->user_name
! 	    found = TRUE;
! 	    ERASE U
  	    ON_ERROR
! 		ret = GsecMsg23;	/* gsec - delete record error */
  	    END_ERROR;
! 	END_FOR
! 	ON_ERROR
! 	    ret = GsecMsg24;	/* gsec - find/delete record error */
! 	END_ERROR;
  
  	if (!ret && !found)
--- 265,284 ----
  
  	found = FALSE;
! 	/* Do not allow SYSDBA user to be deleted */
! 	if (!STRICMP(user_data->user_name, SYSDBA_USER_NAME))
! 	    ret = GsecMsg23;
! 	else
! 	    {
! 	    FOR U IN USERS WITH U.USER_NAME EQ user_data->user_name
! 		found = TRUE;
! 		ERASE U
! 		ON_ERROR
! 		    ret = GsecMsg23;	/* gsec - delete record error */
! 		END_ERROR;
! 	    END_FOR
  	    ON_ERROR
! 		ret = GsecMsg24;	/* gsec - find/delete record error */
  	    END_ERROR;
! 	    }
  
  	if (!ret && !found)