diff options
Diffstat (limited to 'testing/audit/0003-all-get-rid-of-strndupa.patch')
| -rw-r--r-- | testing/audit/0003-all-get-rid-of-strndupa.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/testing/audit/0003-all-get-rid-of-strndupa.patch b/testing/audit/0003-all-get-rid-of-strndupa.patch index e705de4c37..d34bf0cfb7 100644 --- a/testing/audit/0003-all-get-rid-of-strndupa.patch +++ b/testing/audit/0003-all-get-rid-of-strndupa.patch @@ -1,7 +1,7 @@ -From f45e805033c6aed205863d87fe56f5bc7e6fd0c4 Mon Sep 17 00:00:00 2001 +From 38d950e468c1e51937530f884b138076e4897da2 Mon Sep 17 00:00:00 2001 From: Tycho Andersen <tycho@docker.com> Date: Mon, 13 Mar 2017 16:40:08 -0700 -Subject: [PATCH 3/3] all: get rid of strndupa +Subject: [PATCH 3/4] all: get rid of strndupa in one case (src/auditd.c) we don't even need to allocate a buffer, in the other two we do it in two steps to avoid using a non-standard function. @@ -14,10 +14,10 @@ Signed-off-by: Tycho Andersen <tycho@docker.com> 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/auparse/auparse.c b/auparse/auparse.c -index 3677ad7..b428330 100644 +index 058f544..f61d204 100644 --- a/auparse/auparse.c +++ b/auparse/auparse.c -@@ -1096,10 +1096,12 @@ static int extract_timestamp(const char *b, au_event_t *e) +@@ -1102,10 +1102,12 @@ static int extract_timestamp(const char *b, au_event_t *e) int rc = 1; e->host = NULL; @@ -33,7 +33,7 @@ index 3677ad7..b428330 100644 if (ptr) { // Optionally grab the node - may or may not be included diff --git a/src/auditd.c b/src/auditd.c -index 3f0162d..a1c2c51 100644 +index cd49758..2de065a 100644 --- a/src/auditd.c +++ b/src/auditd.c @@ -185,7 +185,7 @@ static void child_handler2( int sig ) @@ -63,7 +63,7 @@ index 3f0162d..a1c2c51 100644 str++; return audit_name_to_msg_type(str); diff --git a/src/ausearch-lol.c b/src/ausearch-lol.c -index b1aec06..5d461b0 100644 +index 29d0a32..3a2e5e8 100644 --- a/src/ausearch-lol.c +++ b/src/ausearch-lol.c @@ -135,10 +135,12 @@ static int extract_timestamp(const char *b, event *e) @@ -82,5 +82,5 @@ index b1aec06..5d461b0 100644 if (ptr) { // Check to see if this is the node info -- -2.11.1 +2.13.1 |