[Firebird-checkins] CVS: firebird2/src/utilities/ibmgr ibmgr.cpp, 1.25.2.2, 1.25.2.3 ibmgr.h, 1.14, 1.14.10.1

[Adriano d. S. F. <asf...@us...>]

Build Version :  T2.5.0.20410 Firebird 2.5 Alpha 1

(writeBuildNum.sh,v 1.20571 2008/06/18 01:45:25 asfernandes )

Update of /cvsroot/firebird/firebird2/src/utilities/ibmgr
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv31030/src/utilities/ibmgr

Modified Files:
      Tag: B2_5_ExtEngines
	ibmgr.cpp ibmgr.h 
Log Message:
Sync with HEAD


Index: ibmgr.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/utilities/ibmgr/ibmgr.cpp,v
retrieving revision 1.25.2.2
retrieving revision 1.25.2.3
diff -b -U3 -r1.25.2.2 -r1.25.2.3
--- ibmgr.cpp	30 May 2008 01:42:41 -0000	1.25.2.2
+++ ibmgr.cpp	18 Jun 2008 01:45:42 -0000	1.25.2.3
@@ -71,8 +71,8 @@
 
 static void copy_str_upper(TEXT*, const TEXT*);
 static bool get_line(int*, SCHAR**, TEXT*);
-static SSHORT get_switches(int, const TEXT* const*, const in_sw_tab_t*,
-	ibmgr_data_t*, bool*, bool);
+static SSHORT get_switches(int argc, TEXT** argv, const in_sw_tab_t* in_sw_table,
+						   ibmgr_data_t* ibmgr_data, bool* quitflag, bool zapPasswd);
 static SSHORT parse_cmd_line(int, TEXT**, bool);
 static void print_config(void);
 static void print_help(void);

Index: ibmgr.h
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/utilities/ibmgr/ibmgr.h,v
retrieving revision 1.14
retrieving revision 1.14.10.1
diff -b -U3 -r1.14 -r1.14.10.1
--- ibmgr.h	11 Feb 2007 09:04:50 -0000	1.14
+++ ibmgr.h	18 Jun 2008 01:45:42 -0000	1.14.10.1
@@ -27,7 +27,8 @@
 
 #define OUTFILE			stderr
 
-static const char* SYSDBA_USER_NAME	= "SYSDBA";
+#include "../jrd/constants.h"
+
 static const char* FIREBIRD_USER_NAME	= "firebird";
 static const char* INTERBASE_USER_NAME	= "interbase";
 static const char* INTERBASE_USER_SHORT= "interbas";