Regenerate files after merging AppArmor integration.
This commit is contained in:
Todd C. Miller
26
configure
vendored
26
configure
vendored
@@ -835,6 +835,7 @@ mansectmisc
|
||||
mansectform
|
||||
mansectsu
|
||||
devdir
|
||||
AAMAN
|
||||
SEMAN
|
||||
PSMAN
|
||||
LCMAN
|
||||
@@ -1038,6 +1039,7 @@ enable_shared_libutil
|
||||
enable_tmpfiles_d
|
||||
enable_devsearch
|
||||
with_selinux
|
||||
with_apparmor
|
||||
enable_sasl
|
||||
enable_timestamp_type
|
||||
enable_offensive_insults
|
||||
@@ -1883,6 +1885,7 @@ Optional Packages:
|
||||
--with-man manual pages use man macros
|
||||
--with-mdoc manual pages use mdoc macros
|
||||
--with-selinux enable SELinux support
|
||||
--with-apparmor enable AppArmor support
|
||||
--with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
|
||||
both]
|
||||
--with-aix-soname=aix|svr4|both
|
||||
@@ -3570,6 +3573,7 @@ ac_config_headers="$ac_config_headers config.h pathnames.h"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#
|
||||
@@ -3643,6 +3647,7 @@ BAMAN=0
|
||||
LCMAN=0
|
||||
PSMAN=0
|
||||
SEMAN=0
|
||||
AAMAN=0
|
||||
LIBINTL=
|
||||
LIBCRYPTO=
|
||||
LIBMD=
|
||||
@@ -6854,6 +6859,26 @@ else $as_nop
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --with-apparmor was given.
|
||||
if test ${with_apparmor+y}
|
||||
then :
|
||||
withval=$with_apparmor; case $with_apparmor in
|
||||
yes) printf "%s\n" "#define HAVE_APPARMOR 1" >>confdefs.h
|
||||
|
||||
AAMAN=1
|
||||
SUDO_LIBS="${SUDO_LIBS} -lapparmor"
|
||||
SUDO_OBJS="${SUDO_OBJS} apparmor.o"
|
||||
;;
|
||||
no) ;;
|
||||
*) as_fn_error $? "--with-apparmor does not take an argument." "$LINENO" 5
|
||||
|
||||
esac
|
||||
else $as_nop
|
||||
with_apparmor=no
|
||||
fi
|
||||
|
||||
|
||||
# Check whether --enable-sasl was given.
|
||||
if test ${enable_sasl+y}
|
||||
then :
|
||||
@@ -34984,5 +35009,6 @@ fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1489,9 +1489,8 @@ AC_ARG_WITH(apparmor, [AS_HELP_STRING([--with-apparmor], [enable AppArmor suppor
|
||||
[case $with_apparmor in
|
||||
yes) AC_DEFINE(HAVE_APPARMOR)
|
||||
AAMAN=1
|
||||
SUDO_LIBS="${SUDO_LIBS} -lapparmor"
|
||||
SUDO_OBJS="${SUDO_OBJS} apparmor.o"
|
||||
AC_CHECK_LIB(apparmor, aa_change_profile,
|
||||
[SUDO_LIBS="${SUDO_LIBS} -lapparmor"])
|
||||
;;
|
||||
no) ;;
|
||||
*) AC_MSG_ERROR([--with-apparmor does not take an argument.])
|
||||
|
||||
@@ -306,9 +306,9 @@
|
||||
#define def_log_passwords (sudo_defs_table[I_LOG_PASSWORDS].sd_un.flag)
|
||||
#define I_PASSPROMPT_REGEX 152
|
||||
#define def_passprompt_regex (sudo_defs_table[I_PASSPROMPT_REGEX].sd_un.list)
|
||||
#define I_INTERCEPT_TYPE 154
|
||||
#define I_INTERCEPT_TYPE 153
|
||||
#define def_intercept_type (sudo_defs_table[I_INTERCEPT_TYPE].sd_un.tuple)
|
||||
#define I_APPARMOR_PROFILE 153
|
||||
#define I_APPARMOR_PROFILE 154
|
||||
#define def_apparmor_profile (sudo_defs_table[I_APPARMOR_PROFILE].sd_un.str)
|
||||
|
||||
enum def_tuple {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -96,16 +96,17 @@ extern int sudoersdebug;
|
||||
CWD = 297, /* CWD */
|
||||
TYPE = 298, /* TYPE */
|
||||
ROLE = 299, /* ROLE */
|
||||
PRIVS = 300, /* PRIVS */
|
||||
LIMITPRIVS = 301, /* LIMITPRIVS */
|
||||
CMND_TIMEOUT = 302, /* CMND_TIMEOUT */
|
||||
NOTBEFORE = 303, /* NOTBEFORE */
|
||||
NOTAFTER = 304, /* NOTAFTER */
|
||||
MYSELF = 305, /* MYSELF */
|
||||
SHA224_TOK = 306, /* SHA224_TOK */
|
||||
SHA256_TOK = 307, /* SHA256_TOK */
|
||||
SHA384_TOK = 308, /* SHA384_TOK */
|
||||
SHA512_TOK = 309 /* SHA512_TOK */
|
||||
APPARMOR_PROFILE = 300, /* APPARMOR_PROFILE */
|
||||
PRIVS = 301, /* PRIVS */
|
||||
LIMITPRIVS = 302, /* LIMITPRIVS */
|
||||
CMND_TIMEOUT = 303, /* CMND_TIMEOUT */
|
||||
NOTBEFORE = 304, /* NOTBEFORE */
|
||||
NOTAFTER = 305, /* NOTAFTER */
|
||||
MYSELF = 306, /* MYSELF */
|
||||
SHA224_TOK = 307, /* SHA224_TOK */
|
||||
SHA256_TOK = 308, /* SHA256_TOK */
|
||||
SHA384_TOK = 309, /* SHA384_TOK */
|
||||
SHA512_TOK = 310 /* SHA512_TOK */
|
||||
};
|
||||
typedef enum yytokentype yytoken_kind_t;
|
||||
#endif
|
||||
@@ -156,16 +157,17 @@ extern int sudoersdebug;
|
||||
#define CWD 297
|
||||
#define TYPE 298
|
||||
#define ROLE 299
|
||||
#define PRIVS 300
|
||||
#define LIMITPRIVS 301
|
||||
#define CMND_TIMEOUT 302
|
||||
#define NOTBEFORE 303
|
||||
#define NOTAFTER 304
|
||||
#define MYSELF 305
|
||||
#define SHA224_TOK 306
|
||||
#define SHA256_TOK 307
|
||||
#define SHA384_TOK 308
|
||||
#define SHA512_TOK 309
|
||||
#define APPARMOR_PROFILE 300
|
||||
#define PRIVS 301
|
||||
#define LIMITPRIVS 302
|
||||
#define CMND_TIMEOUT 303
|
||||
#define NOTBEFORE 304
|
||||
#define NOTAFTER 305
|
||||
#define MYSELF 306
|
||||
#define SHA224_TOK 307
|
||||
#define SHA256_TOK 308
|
||||
#define SHA384_TOK 309
|
||||
#define SHA512_TOK 310
|
||||
|
||||
/* Value type. */
|
||||
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
|
||||
@@ -185,7 +187,7 @@ union YYSTYPE
|
||||
char *string;
|
||||
int tok;
|
||||
|
||||
#line 189 "y.tab.h"
|
||||
#line 191 "y.tab.h"
|
||||
|
||||
};
|
||||
typedef union YYSTYPE YYSTYPE;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -385,7 +385,7 @@ apparmor.o: $(srcdir)/apparmor.c $(incdir)/compat/stdbool.h \
|
||||
$(incdir)/sudo_plugin.h $(incdir)/sudo_queue.h \
|
||||
$(incdir)/sudo_util.h $(srcdir)/sudo.h $(top_builddir)/config.h \
|
||||
$(top_builddir)/pathnames.h
|
||||
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(ASAN_CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(srcdir)/apparmor.c
|
||||
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(ASAN_CFLAGS) $(PIE_CFLAGS) $(HARDENING_CFLAGS) $(srcdir)/apparmor.c
|
||||
apparmor.i: $(srcdir)/apparmor.c $(incdir)/compat/stdbool.h \
|
||||
$(incdir)/sudo_compat.h $(incdir)/sudo_conf.h \
|
||||
$(incdir)/sudo_debug.h $(incdir)/sudo_event.h \
|
||||
|
||||
Reference in New Issue
Block a user