Blame SOURCES/glibc-rh1505492-prototypes-putXent.patch
|
|
c6d234 |
Introduce prototype-style definitions for putgrent, putpwent. Upstream,
|
|
|
c6d234 |
this was done as part of this commit (not backported here):
|
|
|
c6d234 |
|
|
|
c6d234 |
commit 676599b36a92f3c201c5682ee7a5caddd9f370a4
|
|
|
c6d234 |
Author: Florian Weimer <fweimer@redhat.com>
|
|
|
c6d234 |
Date: Fri Oct 2 11:34:13 2015 +0200
|
|
|
c6d234 |
|
|
|
c6d234 |
Harden putpwent, putgrent, putspent, putspent against injection [BZ #18724]
|
|
|
c6d234 |
|
|
|
c6d234 |
diff --git a/grp/putgrent.c b/grp/putgrent.c
|
|
|
c6d234 |
index 176a7a15d8bb6ec2..1d69136c30c81bcd 100644
|
|
|
c6d234 |
--- a/grp/putgrent.c
|
|
|
c6d234 |
+++ b/grp/putgrent.c
|
|
|
c6d234 |
@@ -27,9 +27,7 @@
|
|
|
c6d234 |
/* Write an entry to the given stream.
|
|
|
c6d234 |
This must know the format of the group file. */
|
|
|
c6d234 |
int
|
|
|
c6d234 |
-putgrent (gr, stream)
|
|
|
c6d234 |
- const struct group *gr;
|
|
|
c6d234 |
- FILE *stream;
|
|
|
c6d234 |
+putgrent (const struct group *gr, FILE *stream)
|
|
|
c6d234 |
{
|
|
|
c6d234 |
int retval;
|
|
|
c6d234 |
|
|
|
c6d234 |
diff --git a/pwd/putpwent.c b/pwd/putpwent.c
|
|
|
c6d234 |
index e9470ed1012a1789..9a9f04dcf4b596ee 100644
|
|
|
c6d234 |
--- a/pwd/putpwent.c
|
|
|
c6d234 |
+++ b/pwd/putpwent.c
|
|
|
c6d234 |
@@ -24,9 +24,7 @@
|
|
|
c6d234 |
/* Write an entry to the given stream.
|
|
|
c6d234 |
This must know the format of the password file. */
|
|
|
c6d234 |
int
|
|
|
c6d234 |
-putpwent (p, stream)
|
|
|
c6d234 |
- const struct passwd *p;
|
|
|
c6d234 |
- FILE *stream;
|
|
|
c6d234 |
+putpwent (const struct passwd *p, FILE *stream)
|
|
|
c6d234 |
{
|
|
|
c6d234 |
if (p == NULL || stream == NULL)
|
|
|
c6d234 |
{
|