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

Add definition of U_ for --disable-nsl

Browse Source 
Don't define warning_gettext if --disable-nsl
Bug #621; from Daniel Richard G.
This commit is contained in:
Todd C. Miller
2013-11-19 09:45:13 -07:00
parent 0a7ebf8b23
commit 054a94e6c9
3 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/gettext.h
View File

@@ -64,6 +64,7 @@
*/ */
# define _(String) String # define _(String) String
# define N_(String) String # define N_(String) String
# define U_(String) String
# define textdomain(Domain) # define textdomain(Domain)
# define bindtextdomain(Package, Directory) # define bindtextdomain(Package, Directory)
# define ngettext(String, String_Plural, N) \ # define ngettext(String, String_Plural, N) \

2
plugins/sudoers/locale.c
View File

@@ -108,6 +108,7 @@ sudoers_setlocale(int newlocale, int *prevlocale)
return res ? true : false; return res ? true : false;
} }
#ifdef HAVE_LIBINTL_H
char * char *
warning_gettext(const char *msgid) warning_gettext(const char *msgid)
{ {
@@ -120,3 +121,4 @@ warning_gettext(const char *msgid)
return msg; return msg;
} }
#endif /* HAVE_LIBINTL_H */

2
src/locale_stub.c
View File

@@ -25,9 +25,11 @@
#include "fatal.h" #include "fatal.h"
#include "gettext.h" #include "gettext.h"
#ifdef HAVE_LIBINTL_H
/* No need to swap locales in the front end. */ /* No need to swap locales in the front end. */
char * char *
warning_gettext(const char *msgid) warning_gettext(const char *msgid)
{ {
return gettext(msgid); return gettext(msgid);
} }
#endif /* HAVE_LIBINTL_H */