From: Claudio V. C. <ro...@us...> - 2003-12-31 05:36:44
|
Build Version : T2.0.0.6186 Firebird 2.0 UNSTABLE (writeBuildNum.sh,v 1.6186 2003/12/31 05:36:09 robocop Exp ) Update of /cvsroot/firebird/firebird2/src/utilities/gsec In directory sc8-pr-cvs1:/tmp/cvs-serv13296/src/utilities/gsec Modified Files: gsec.cpp security.epp Log Message: Cleanup Index: gsec.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/utilities/gsec/gsec.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -b -U3 -r1.17 -r1.18 --- gsec.cpp 30 Dec 2003 02:48:21 -0000 1.17 +++ gsec.cpp 31 Dec 2003 05:36:09 -0000 1.18 @@ -69,7 +69,7 @@ static void data_print(void*, const internal_user_data*, bool); static bool get_line(int*, SCHAR**, TEXT*, tsec*); -static bool get_switches(int, const TEXT* const*, IN_SW_TAB, tsec*, bool*); +static bool get_switches(int, const TEXT* const*, const in_sw_tab_t*, tsec*, bool*); static SSHORT parse_cmd_line(int, const TEXT* const*, tsec*); static void printhelp(void); #ifndef SUPERSERVER @@ -520,7 +520,7 @@ static bool get_switches( int argc, const TEXT* const* argv, - IN_SW_TAB in_sw_table, + const in_sw_tab_t* in_sw_table, tsec* tdsec, bool* quitflag) { /************************************** Index: security.epp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/utilities/gsec/security.epp,v retrieving revision 1.7 retrieving revision 1.8 diff -b -U3 -r1.7 -r1.8 --- security.epp 22 Dec 2003 10:00:59 -0000 1.7 +++ security.epp 31 Dec 2003 05:36:09 -0000 1.8 @@ -258,15 +258,7 @@ found = false; /* Do not allow SYSDBA user to be deleted */ -#ifdef HAVE_STRCASECMP - if (!strcasecmp(io_user_data->user_name, SYSDBA_USER_NAME)) -#else -#ifdef HAVE_STRICMP - if (!stricmp(io_user_data->user_name, SYSDBA_USER_NAME)) -#else -#error dont know how to compare strings case insensitive on this system -#endif /* HAVE_STRICMP */ -#endif /* HAVE_STRCASECMP */ + if (!fb_stricmp(io_user_data->user_name, SYSDBA_USER_NAME)) ret = GsecMsg23; else { FOR U IN USERS WITH U.USER_NAME EQ io_user_data->user_name |