mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-30 13:58:22 +00:00
Code Issues Releases Wiki Activity

- Add configure check for the existence of asprint(3).

Browse Source 
- Add -Wall to compilation (is there a way to only define this in the
  toplevel Makefile.am and have it propogate down?)
- fix warnings once -Wall was enabled:
  - no asprintf prototype due to _GNU_SOURCE not being defined
  - possible uninitialezed use in scanner.l
  - printf's that expected ints but were passed longs in the testsuite
This commit is contained in:
Steve Beattie
2007-08-21 17:28:34 +00:00
parent b2d95817fa
commit aa94fc1d08
7 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
changehat/libapparmor/configure.in
View File

@@ -6,7 +6,6 @@ AM_PROG_LEX
AC_PROG_YACC AC_PROG_YACC
AC_PATH_PROG([SWIG], [swig]) AC_PATH_PROG([SWIG], [swig])
PROG_POD2MAN PROG_POD2MAN
@@ -57,6 +56,8 @@ AM_CONDITIONAL(BUILD_ROOTLIB, test x$enable_rootlib = xyes)
AC_HEADER_STDC AC_HEADER_STDC
AC_CHECK_HEADERS(unistd.h stdint.h) AC_CHECK_HEADERS(unistd.h stdint.h)
AC_CHECK_FUNCS(asprintf)
AM_PROG_CC_C_O AM_PROG_CC_C_O
AC_C_CONST AC_C_CONST
AM_PROG_LIBTOOL AM_PROG_LIBTOOL

6
changehat/libapparmor/src/Makefile.am
View File

@@ -2,10 +2,12 @@ INCLUDES = $(all_includes)
BUILT_SOURCES = grammar.h scanner.h BUILT_SOURCES = grammar.h scanner.h
AM_YFLAGS = -d -p aalogparse_ AM_YFLAGS = -d -p aalogparse_
AM_CFLAGS = @CFLAGS@ -D_GNU_SOURCE -Wall
scanner.h: scanner.h: scanner.l
$(LEX) scanner.l $(LEX) scanner.l
scanner.c: scanner.l
changehatdir = $(includedir)/sys changehatdir = $(includedir)/sys
changehat_HEADERS = apparmor.h changehat_HEADERS = apparmor.h

2
changehat/libapparmor/src/aalogparse.h
View File

@@ -117,7 +117,7 @@ typedef struct
aa_record_event_type event; /* Event type */ aa_record_event_type event; /* Event type */
long pid; /* PID of the program logging the message */ long pid; /* PID of the program logging the message */
long task; long task;
long magic_token; unsigned long magic_token;
long epoch; /* example: 12345679 */ long epoch; /* example: 12345679 */
unsigned int audit_sub_id; /* example: 12 */ unsigned int audit_sub_id; /* example: 12 */

2
changehat/libapparmor/src/change_hat.c
View File

@@ -8,8 +8,6 @@
*/ */
#define _GNU_SOURCE /* for asprintf */
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>

2
changehat/libapparmor/src/scanner.l
View File

@@ -102,7 +102,7 @@ audit "audit"
%% %%
%{ %{
char string_buf[512]; char string_buf[512];
char *string_buf_ptr; char *string_buf_ptr = string_buf; /* assignment to quiet gcc warning */
/* yy_flex_debug = 1; */ /* yy_flex_debug = 1; */
%} %}

3
changehat/libapparmor/testsuite/Makefile.am
View File

@@ -5,11 +5,12 @@ AUTOMAKE_OPTIONS = dejagnu
INCLUDES = -I. -I$(top_srcdir)/src INCLUDES = -I. -I$(top_srcdir)/src
AM_CPPFLAGS = $(DEBUG_FLAGS) -DLOCALEDIR=\"${localedir}\" AM_CPPFLAGS = $(DEBUG_FLAGS) -DLOCALEDIR=\"${localedir}\"
AM_CFLAGS = -Wall
noinst_PROGRAMS = test_multi.multi noinst_PROGRAMS = test_multi.multi
test_multi_multi_SOURCES = test_multi.c test_multi_multi_SOURCES = test_multi.c
test_multi_multi_CFLAGS = $(CFLAGS) test_multi_multi_CFLAGS = $(CFLAGS) -Wall
test_multi_multi_LDFLAGS = $(LDFLAGS) ../src/.libs/libapparmor.a test_multi_multi_LDFLAGS = $(LDFLAGS) ../src/.libs/libapparmor.a
clean-local: clean-local:

6
changehat/libapparmor/testsuite/test_multi.c
View File

@@ -131,7 +131,7 @@ int print_results(aa_log_record *record)
} }
if (record->task != 0) if (record->task != 0)
{ {
printf("Task: %i\n", record->task); printf("Task: %ld\n", record->task);
} }
if (record->parent != NULL) if (record->parent != NULL)
{ {
@@ -139,7 +139,7 @@ int print_results(aa_log_record *record)
} }
if (record->magic_token != 0) if (record->magic_token != 0)
{ {
printf("Token: %i\n", record->magic_token); printf("Token: %lu\n", record->magic_token);
} }
if (record->info != NULL) if (record->info != NULL)
{ {
@@ -147,7 +147,7 @@ int print_results(aa_log_record *record)
} }
if (record->pid != 0) if (record->pid != 0)
{ {
printf("PID: %i\n", record->pid); printf("PID: %ld\n", record->pid);
} }
if (record->active_hat != NULL) if (record->active_hat != NULL)
{ {