isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mark sudoerserror() messages for translation.

Browse Source
This commit is contained in:
Todd C. Miller
2020-09-27 06:51:16 -06:00
parent ddc1383838
commit 0276a565e6
2 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
plugins/sudoers/toke.c
View File

@@ -3180,7 +3180,7 @@ YY_RULE_SETUP
BEGIN prev_state; BEGIN prev_state;
if (sudoerslval.string == NULL) { if (sudoerslval.string == NULL) {
sudoerserror("empty string"); sudoerserror(N_("empty string"));
LEXTRACE("ERROR "); LEXTRACE("ERROR ");
return ERROR; return ERROR;
} }
@@ -3190,7 +3190,7 @@ YY_RULE_SETUP
if (sudoerslval.string[1] == '\0' || if (sudoerslval.string[1] == '\0' ||
(sudoerslval.string[1] == ':' && (sudoerslval.string[1] == ':' &&
sudoerslval.string[2] == '\0')) { sudoerslval.string[2] == '\0')) {
sudoerserror("empty group"); sudoerserror(N_("empty group"));
LEXTRACE("ERROR "); LEXTRACE("ERROR ");
return ERROR; return ERROR;
} }
@@ -3198,7 +3198,7 @@ YY_RULE_SETUP
return USERGROUP; return USERGROUP;
case '+': case '+':
if (sudoerslval.string[1] == '\0') { if (sudoerslval.string[1] == '\0') {
sudoerserror("empty netgroup"); sudoerserror(N_("empty netgroup"));
LEXTRACE("ERROR "); LEXTRACE("ERROR ");
return ERROR; return ERROR;
} }
@@ -3322,7 +3322,7 @@ YY_RULE_SETUP
#line 292 "toke.l" #line 292 "toke.l"
{ {
if (continued) { if (continued) {
sudoerserror("invalid line continuation"); sudoerserror(N_("invalid line continuation"));
LEXTRACE("ERROR "); LEXTRACE("ERROR ");
return ERROR; return ERROR;
} }
@@ -3337,7 +3337,7 @@ YY_RULE_SETUP
#line 304 "toke.l" #line 304 "toke.l"
{ {
if (continued) { if (continued) {
sudoerserror("invalid line continuation"); sudoerserror(N_("invalid line continuation"));
LEXTRACE("ERROR "); LEXTRACE("ERROR ");
return ERROR; return ERROR;
} }
@@ -3353,7 +3353,7 @@ YY_RULE_SETUP
#line 316 "toke.l" #line 316 "toke.l"
{ {
if (continued) { if (continued) {
sudoerserror("invalid line continuation"); sudoerserror(N_("invalid line continuation"));
LEXTRACE("ERROR "); LEXTRACE("ERROR ");
return ERROR; return ERROR;
} }
@@ -3373,7 +3373,7 @@ YY_RULE_SETUP
#line 332 "toke.l" #line 332 "toke.l"
{ {
if (continued) { if (continued) {
sudoerserror("invalid line continuation"); sudoerserror(N_("invalid line continuation"));
LEXTRACE("ERROR "); LEXTRACE("ERROR ");
return ERROR; return ERROR;
} }
@@ -3395,7 +3395,7 @@ YY_RULE_SETUP
int n; int n;
if (continued) { if (continued) {
sudoerserror("invalid line continuation"); sudoerserror(N_("invalid line continuation"));
LEXTRACE("ERROR "); LEXTRACE("ERROR ");
return ERROR; return ERROR;
} }
@@ -3438,7 +3438,7 @@ YY_RULE_SETUP
int n; int n;
if (continued) { if (continued) {
sudoerserror("invalid line continuation"); sudoerserror(N_("invalid line continuation"));
LEXTRACE("ERROR "); LEXTRACE("ERROR ");
return ERROR; return ERROR;
} }
@@ -3580,9 +3580,9 @@ YY_RULE_SETUP
#line 488 "toke.l" #line 488 "toke.l"
{ {
if (sudoerstext[0] == '+') if (sudoerstext[0] == '+')
sudoerserror("empty netgroup"); sudoerserror(N_("empty netgroup"));
else else
sudoerserror("empty group"); sudoerserror(N_("empty group"));
LEXTRACE("ERROR "); LEXTRACE("ERROR ");
return ERROR; return ERROR;
} }
@@ -3634,7 +3634,7 @@ YY_RULE_SETUP
#line 527 "toke.l" #line 527 "toke.l"
{ {
if (!ipv6_valid(sudoerstext)) { if (!ipv6_valid(sudoerstext)) {
sudoerserror("invalid IPv6 address"); sudoerserror(N_("invalid IPv6 address"));
LEXTRACE("ERROR "); LEXTRACE("ERROR ");
return ERROR; return ERROR;
} }
@@ -3649,7 +3649,7 @@ YY_RULE_SETUP
#line 539 "toke.l" #line 539 "toke.l"
{ {
if (!ipv6_valid(sudoerstext)) { if (!ipv6_valid(sudoerstext)) {
sudoerserror("invalid IPv6 address"); sudoerserror(N_("invalid IPv6 address"));
LEXTRACE("ERROR "); LEXTRACE("ERROR ");
return ERROR; return ERROR;
} }
@@ -3965,7 +3965,7 @@ YY_RULE_SETUP
/* re-scan after changing state */ /* re-scan after changing state */
BEGIN INITIAL; BEGIN INITIAL;
sudoersless(0); sudoersless(0);
sudoerserror("unexpected line break in string"); sudoerserror(N_("unexpected line break in string"));
LEXTRACE("ERROR "); LEXTRACE("ERROR ");
return ERROR; return ERROR;
} }
@@ -4033,9 +4033,9 @@ case YY_STATE_EOF(EXPECTPATH):
{ {
if (YY_START != INITIAL) { if (YY_START != INITIAL) {
if (YY_START == INSTR) if (YY_START == INSTR)
sudoerserror("unterminated string"); sudoerserror(N_("unterminated string"));
else else
sudoerserror("unexpected state at EOF"); sudoerserror(N_("unexpected state at end of file"));
BEGIN INITIAL; BEGIN INITIAL;
LEXTRACE("ERROR "); LEXTRACE("ERROR ");
return ERROR; return ERROR;

32
plugins/sudoers/toke.l
View File

@@ -177,7 +177,7 @@ DEFVAR [a-z_]+
BEGIN prev_state; BEGIN prev_state;
if (sudoerslval.string == NULL) { if (sudoerslval.string == NULL) {
sudoerserror("empty string"); sudoerserror(N_("empty string"));
LEXTRACE("ERROR "); LEXTRACE("ERROR ");
return ERROR; return ERROR;
} }
@@ -187,7 +187,7 @@ DEFVAR [a-z_]+
if (sudoerslval.string[1] == '\0' || if (sudoerslval.string[1] == '\0' ||
(sudoerslval.string[1] == ':' && (sudoerslval.string[1] == ':' &&
sudoerslval.string[2] == '\0')) { sudoerslval.string[2] == '\0')) {
sudoerserror("empty group"); sudoerserror(N_("empty group"));
LEXTRACE("ERROR "); LEXTRACE("ERROR ");
return ERROR; return ERROR;
} }
@@ -195,7 +195,7 @@ DEFVAR [a-z_]+
return USERGROUP; return USERGROUP;
case '+': case '+':
if (sudoerslval.string[1] == '\0') { if (sudoerslval.string[1] == '\0') {
sudoerserror("empty netgroup"); sudoerserror(N_("empty netgroup"));
LEXTRACE("ERROR "); LEXTRACE("ERROR ");
return ERROR; return ERROR;
} }
@@ -291,7 +291,7 @@ DEFVAR [a-z_]+
<INITIAL>@include { <INITIAL>@include {
if (continued) { if (continued) {
sudoerserror("invalid line continuation"); sudoerserror(N_("invalid line continuation"));
LEXTRACE("ERROR "); LEXTRACE("ERROR ");
return ERROR; return ERROR;
} }
@@ -303,7 +303,7 @@ DEFVAR [a-z_]+
<INITIAL>@includedir { <INITIAL>@includedir {
if (continued) { if (continued) {
sudoerserror("invalid line continuation"); sudoerserror(N_("invalid line continuation"));
LEXTRACE("ERROR "); LEXTRACE("ERROR ");
return ERROR; return ERROR;
} }
@@ -315,7 +315,7 @@ DEFVAR [a-z_]+
<INITIAL>^#include[[:blank:]]+.*(\r\n|\n)? { <INITIAL>^#include[[:blank:]]+.*(\r\n|\n)? {
if (continued) { if (continued) {
sudoerserror("invalid line continuation"); sudoerserror(N_("invalid line continuation"));
LEXTRACE("ERROR "); LEXTRACE("ERROR ");
return ERROR; return ERROR;
} }
@@ -331,7 +331,7 @@ DEFVAR [a-z_]+
<INITIAL>^#includedir[[:blank:]]+.*(\r\n|\n)? { <INITIAL>^#includedir[[:blank:]]+.*(\r\n|\n)? {
if (continued) { if (continued) {
sudoerserror("invalid line continuation"); sudoerserror(N_("invalid line continuation"));
LEXTRACE("ERROR "); LEXTRACE("ERROR ");
return ERROR; return ERROR;
} }
@@ -350,7 +350,7 @@ DEFVAR [a-z_]+
int n; int n;
if (continued) { if (continued) {
sudoerserror("invalid line continuation"); sudoerserror(N_("invalid line continuation"));
LEXTRACE("ERROR "); LEXTRACE("ERROR ");
return ERROR; return ERROR;
} }
@@ -390,7 +390,7 @@ DEFVAR [a-z_]+
int n; int n;
if (continued) { if (continued) {
sudoerserror("invalid line continuation"); sudoerserror(N_("invalid line continuation"));
LEXTRACE("ERROR "); LEXTRACE("ERROR ");
return ERROR; return ERROR;
} }
@@ -487,9 +487,9 @@ NOFOLLOW[[:blank:]]*: {
<INITIAL,GOTDEFS>(\+|\%|\%:) { <INITIAL,GOTDEFS>(\+|\%|\%:) {
if (sudoerstext[0] == '+') if (sudoerstext[0] == '+')
sudoerserror("empty netgroup"); sudoerserror(N_("empty netgroup"));
else else
sudoerserror("empty group"); sudoerserror(N_("empty group"));
LEXTRACE("ERROR "); LEXTRACE("ERROR ");
return ERROR; return ERROR;
} }
@@ -526,7 +526,7 @@ NOFOLLOW[[:blank:]]*: {
{IPV6ADDR}(\/{IPV6ADDR})? { {IPV6ADDR}(\/{IPV6ADDR})? {
if (!ipv6_valid(sudoerstext)) { if (!ipv6_valid(sudoerstext)) {
sudoerserror("invalid IPv6 address"); sudoerserror(N_("invalid IPv6 address"));
LEXTRACE("ERROR "); LEXTRACE("ERROR ");
return ERROR; return ERROR;
} }
@@ -538,7 +538,7 @@ NOFOLLOW[[:blank:]]*: {
{IPV6ADDR}\/([0-9]|[1-9][0-9]|1[01][0-9]|12[0-8]) { {IPV6ADDR}\/([0-9]|[1-9][0-9]|1[01][0-9]|12[0-8]) {
if (!ipv6_valid(sudoerstext)) { if (!ipv6_valid(sudoerstext)) {
sudoerserror("invalid IPv6 address"); sudoerserror(N_("invalid IPv6 address"));
LEXTRACE("ERROR "); LEXTRACE("ERROR ");
return ERROR; return ERROR;
} }
@@ -762,7 +762,7 @@ sudoedit {
/* re-scan after changing state */ /* re-scan after changing state */
BEGIN INITIAL; BEGIN INITIAL;
sudoersless(0); sudoersless(0);
sudoerserror("unexpected line break in string"); sudoerserror(N_("unexpected line break in string"));
LEXTRACE("ERROR "); LEXTRACE("ERROR ");
return ERROR; return ERROR;
} }
@@ -806,9 +806,9 @@ sudoedit {
<*><<EOF>> { <*><<EOF>> {
if (YY_START != INITIAL) { if (YY_START != INITIAL) {
if (YY_START == INSTR) if (YY_START == INSTR)
sudoerserror("unterminated string"); sudoerserror(N_("unterminated string"));
else else
sudoerserror("unexpected state at EOF"); sudoerserror(N_("unexpected state at end of file"));
BEGIN INITIAL; BEGIN INITIAL;
LEXTRACE("ERROR "); LEXTRACE("ERROR ");
return ERROR; return ERROR;