We must include gettext.h before missing.h as it includes system

headers.  Also add missing DEFAULT_TEXT_DOMAIN defines in sudoers
audit code that does not include sudoers.h.
This commit is contained in:
Todd C. Miller
2014-02-11 09:40:59 -07:00
parent 02d86aafe8
commit 12a1b672c0
22 changed files with 51 additions and 42 deletions

View File

@@ -33,6 +33,9 @@
#endif /* HAVE_STDBOOL_H */
#include <stdarg.h>
#define DEFAULT_TEXT_DOMAIN "sudoers"
#include "gettext.h" /* must be included before missing.h */
#include "missing.h"
#include "logging.h"
#include "sudo_debug.h"
@@ -44,9 +47,6 @@
# include "linux_audit.h"
#endif
#define DEFAULT_TEXT_DOMAIN "sudoers"
#include "gettext.h"
void
audit_success(char *exec_args[])
{

View File

@@ -30,9 +30,11 @@
#include <errno.h>
#include <unistd.h>
#define DEFAULT_TEXT_DOMAIN "sudoers"
#include "gettext.h" /* must be included before missing.h */
#include "missing.h"
#include "fatal.h"
#include "gettext.h"
#include "sudo_debug.h"
#include "bsm_audit.h"

View File

@@ -31,10 +31,12 @@
#include <string.h>
#include <libaudit.h>
#define DEFAULT_TEXT_DOMAIN "sudoers"
#include "gettext.h" /* must be included before missing.h */
#include "missing.h"
#include "fatal.h"
#include "alloc.h"
#include "gettext.h"
#include "sudo_debug.h"
#include "linux_audit.h"

View File

@@ -38,11 +38,13 @@
# include "compat/stdbool.h"
#endif /* HAVE_STDBOOL_H */
#define DEFAULT_TEXT_DOMAIN "sudoers"
#include "gettext.h" /* must be included before missing.h */
#include "missing.h"
#include "fatal.h"
#include "alloc.h"
#include "logging.h"
#include "gettext.h"
static int current_locale = SUDOERS_LOCALE_USER;
static char *user_locale;

View File

@@ -29,6 +29,9 @@
# include "compat/stdbool.h"
#endif /* HAVE_STDBOOL_H */
#define DEFAULT_TEXT_DOMAIN "sudoers"
#include "gettext.h" /* must be included before missing.h */
#include <pathnames.h>
#include "missing.h"
#include "fatal.h"
@@ -42,9 +45,6 @@
#include "sudo_debug.h"
#include "sudo_util.h"
#define DEFAULT_TEXT_DOMAIN "sudoers"
#include "gettext.h"
/*
* Password db and supplementary group IDs with associated group names.
*/

View File

@@ -89,10 +89,11 @@
#include <pathnames.h>
#include "gettext.h" /* must be included before missing.h */
#include "missing.h"
#include "alloc.h"
#include "fatal.h"
#include "gettext.h"
#include "logging.h"
#include "iolog.h"
#include "queue.h"

View File

@@ -79,7 +79,6 @@
#include "sudoers.h"
#include "parse.h"
#include "redblack.h"
#include "gettext.h"
#include "sudoers_version.h"
#include "sudo_conf.h"
#include <gram.h>

View File

@@ -40,7 +40,6 @@
#include "sudoers.h"
#include "parse.h"
#include "gettext.h"
#include <gram.h>
/*