Skip to content

Commit

Permalink
Fixed CORE-3116: gsec outputs list of users to stderr instead stdout
Browse files Browse the repository at this point in the history
  • Loading branch information
@AlexPeshkoff
AlexPeshkoff committed Aug 23, 2010
1 parent 79e1e78 commit f11f5ec
Showing 1 changed file with 78 additions and 56 deletions.
134 changes: 78 additions & 56 deletions src/utilities/gsec/gsec.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ using MsgFormat::SafeArg;
//const int MAXARGS = 20; // max number of args allowed on command line
const int MAXSTUFF = 1000; // longest interactive command line

static void util_output(const SCHAR*, ...);

static void util_output(bool error, const SCHAR*, ...);
static void gsecMessage(bool error, USHORT number, const char* str = NULL);
static void data_print(void*, const internal_user_data*, bool);
static bool get_line(Firebird::UtilSvc::ArgvType&, TEXT*, size_t);
static bool get_switches(Firebird::UtilSvc::ArgvType&, const in_sw_tab_t*, tsec*, bool*);
Expand Down Expand Up @@ -427,13 +427,13 @@ static void data_print(void* /*arg*/, const internal_user_data* data, bool first
{
if (first)
{
GSEC_print(GsecMsg26);
GSEC_print(GsecMsg27);
gsecMessage(false, GsecMsg26);
gsecMessage(false, GsecMsg27);
// msg26: " user name uid gid admin full name"
// msg27: "-------------------------------------------------------------------------------------------------"
}

util_output("%-*.*s %5d %5d %-5.5s %s %s %s\n",
util_output(false, "%-*.*s %5d %5d %-5.5s %s %s %s\n",
USERNAME_LENGTH, USERNAME_LENGTH, data->user_name,
data->uid, data->gid, data->admin ? "admin" : "",
data->first_name, data->middle_name, data->last_name);
Expand Down Expand Up @@ -944,7 +944,7 @@ static bool get_switches(Firebird::UtilSvc::ArgvType& argv,
{
TEXT msg[MSG_LENGTH];
msg_get(GsecMsg39, msg);
util_output("%s %s\n", msg, GDS_VERSION);
util_output(true, "%s %s\n", msg, GDS_VERSION);
}
tdsec->tsec_sw_version = true;
break;
Expand Down Expand Up @@ -1014,177 +1014,177 @@ static void printhelp()
*
**************************************/

util_output("\n%s", " ");
util_output(true, "\n%s", " ");
GSEC_print(GsecMsg45);
// gsec utility - maintains user password database

util_output("\n%s", " ");
util_output(true, "\n%s", " ");
GSEC_print(GsecMsg46);
util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print_partial(GsecMsg2);
GSEC_print_partial(GsecMsg82);
GSEC_print(GsecMsg47);
// gsec [ <options> ... ] -<command> [ <parameter> ... ]

util_output("\n%s", " ");
util_output(true, "\n%s", " ");
GSEC_print(GsecMsg48);
// interactive usage:

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print_partial(GsecMsg2);
GSEC_print(GsecMsg82);
// gsec [ <options> ... ]

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print_partial(GsecMsg1);
util_output("\n%s", " ");
util_output(true, "\n%s", " ");
GSEC_print(GsecMsg47);
// GSEC> <command> [ <parameter> ... ]

util_output("\n%s", " ");
util_output(true, "\n%s", " ");
GSEC_print(GsecMsg83);
// available options:

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print(GsecMsg84);
// -user <database administrator name>

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print(GsecMsg85);
// -password <database administrator password>

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print(GsecMsg95);
// -fetch_password <fetch database administrator password from file>

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print(GsecMsg86);
// -role <database administrator SQL role name>

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print(GsecMsg91);
// -trusted (use trusted authentication)

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print(GsecMsg87);
// -database <database to manage>

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print(GsecMsg88);
// -nz

util_output("\n%s", " ");
util_output(true, "\n%s", " ");
GSEC_print(GsecMsg49);
// available commands:

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print(GsecMsg50);
// adding a new user:

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print(GsecMsg51);
// add <name> [ <parameter> ... ]

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print(GsecMsg52);
// deleting a current user:

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print(GsecMsg53);
// delete <name>

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print(GsecMsg54);
// displaying all users:

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print(GsecMsg55);
// display

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print(GsecMsg56);
// displaying one user:

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print(GsecMsg57);
// display <name>

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print(GsecMsg58);
// modifying a user's parameters:

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print(GsecMsg59);
// modify <name> <parameter> [ <parameter> ... ]

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print(GsecMsg98);
// changing admins mapping to SYSDBA:

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print(GsecMsg100);
// -ma(pping) {set|drop}

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print(GsecMsg60);
// help:

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print(GsecMsg61);
// ? (interactive only)

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print(GsecMsg62);
// help

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print(GsecMsg89);
// displaying version number:

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print(GsecMsg90);
// z (interactive only)

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print(GsecMsg63);
// quit interactive session:

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print(GsecMsg64);
// quit (interactive only)

util_output("\n%s", " ");
util_output(true, "\n%s", " ");
GSEC_print(GsecMsg65);
// available parameters:

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print(GsecMsg66);
// -pw <password>

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print(GsecMsg67);
// -uid <uid>

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print(GsecMsg68);
// -gid <gid>

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print(GsecMsg71);
// -fname <firstname>

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print(GsecMsg72);
// -mname <middlename>

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print(GsecMsg73);
// -lname <lastname>

util_output("%s", " ");
util_output(true, "%s", " ");
GSEC_print(GsecMsg102);
// -adm(in) {yes|no}
util_output("\n", NULL);
util_output(true, "\n", NULL);
}


Expand Down Expand Up @@ -1272,12 +1272,12 @@ void GSEC_print_status(const ISC_STATUS* status_vector)
while (fb_interpret(s, sizeof(s), &vector))
{
const char* nl = (s[0] ? s[strlen(s) - 1] != '\n' : true) ? "\n" : "";
util_output("%s%s", s, nl);
util_output(true, "%s%s", s, nl);
}
}
}

static void util_output(const SCHAR* format, ...)
static void util_output(bool error, const SCHAR* format, ...)
{
/**************************************
*
Expand All @@ -1298,7 +1298,14 @@ static void util_output(const SCHAR* format, ...)
Firebird::string buf;
buf.vprintf(format, arglist);

tdsec->utilSvc->outputError(buf.c_str());
if (error)
{
tdsec->utilSvc->outputError(buf.c_str());
}
else
{
tdsec->utilSvc->outputVerbose(buf.c_str());
}
}
va_end(arglist);
}
Expand Down Expand Up @@ -1386,7 +1393,22 @@ void GSEC_print(USHORT number, const char* str)
**************************************
*
* Functional description
* Retrieve a message from the error file, format it, and print it.
* Retrieve a message from the error file, format it, and print it to stderr.
*
**************************************/
gsecMessage(true, number, str);
}

static void gsecMessage(bool error, USHORT number, const char* str)
{
/**************************************
*
* g s e c M e s s a g e
*
**************************************
*
* Functional description
* Retrieve a message from the error file, format it, and print.
*
**************************************/
TEXT buffer[256];
Expand All @@ -1396,7 +1418,7 @@ void GSEC_print(USHORT number, const char* str)
arg << str;

fb_msg_format(0, GSEC_MSG_FAC, number, sizeof(buffer), buffer, arg);
util_output("%s\n", buffer);
util_output(error, "%s\n", buffer);
}

void GSEC_print_partial(USHORT number)
Expand All @@ -1415,7 +1437,7 @@ void GSEC_print_partial(USHORT number)
TEXT buffer[256];

fb_msg_format(0, GSEC_MSG_FAC, number, sizeof(buffer), buffer, dummy);
util_output("%s ", buffer);
util_output(true, "%s ", buffer);
}


Expand Down

0 comments on commit f11f5ec

Please sign in to comment.