mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-22 01:49:11 +00:00
Code Issues Releases Wiki Activity

Avoid conflicts with system definitions in grp.h and pwd.h

Browse Source
This commit is contained in:
Todd C. Miller 2010-11-20 10:33:23 -05:00
parent 5a4762b2b7
commit 5a0f2164ef
4 changed files with 75 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MANIFEST
View File

@ -183,6 +183,7 @@ plugins/sudoers/timestr.c
plugins/sudoers/toke.c plugins/sudoers/toke.c
plugins/sudoers/toke.l plugins/sudoers/toke.l
plugins/sudoers/tsgetgrpw.c plugins/sudoers/tsgetgrpw.c
plugins/sudoers/tsgetgrpw.h
plugins/sudoers/visudo.c plugins/sudoers/visudo.c
pp pp
src/Makefile.in src/Makefile.in

3
plugins/sudoers/testsudoers.c
View File

@ -55,12 +55,11 @@
#endif /* HAVE_NETGROUP_H */ #endif /* HAVE_NETGROUP_H */
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include <pwd.h>
#include <grp.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <netdb.h> #include <netdb.h>
#include "tsgetgrpw.h"
#include "sudoers.h" #include "sudoers.h"
#include "interfaces.h" #include "interfaces.h"
#include "parse.h" #include "parse.h"

3
plugins/sudoers/tsgetgrpw.c
View File

@ -44,9 +44,8 @@
#endif /* HAVE_STRINGS_H */ #endif /* HAVE_STRINGS_H */
#include <fcntl.h> #include <fcntl.h>
#include <limits.h> #include <limits.h>
#include <pwd.h>
#include <grp.h>
#include "tsgetgrpw.h"
#include "sudoers.h" #include "sudoers.h"
#ifndef LINE_MAX #ifndef LINE_MAX

72
plugins/sudoers/tsgetgrpw.h Normal file
View File

@ -0,0 +1,72 @@
/*
* Copyright (c) 2010 Todd C. Miller <Todd.Miller@courtesan.com>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/*
* Trivial replacements for the libc get{gr,pw}{uid,nam}() routines
* for use by testsudoers in the sudo test harness.
* We need our own since many platforms don't provide set{pw,gr}file().
*/
#include <config.h>
/*
* Define away the system prototypes so we don't have any conflicts.
*/
#define setgrfile sys_setgrfile
#define setgrent sys_setgrent
#define endgrent sys_endgrent
#define getgrent sys_getgrent
#define getgrnam sys_getgrnam
#define getgrgid sys_getgrgid
#define setpwfile sys_setpwfile
#define setpwent sys_setpwent
#define endpwent sys_endpwent
#define getpwent sys_getpwent
#define getpwnam sys_getpwnam
#define getpwuid sys_getpwuid
#include <pwd.h>
#include <grp.h>
#undef setgrfile
#undef setgrent
#undef endgrent
#undef getgrent
#undef getgrnam
#undef getgrgid
void setgrfile(const char *);
void setgrent(void);
void endgrent(void);
struct group *getgrent(void);
struct group *getgrnam(const char *);
struct group *getgrgid(gid_t);
#undef setpwfile
#undef setpwent
#undef endpwent
#undef getpwent
#undef getpwnam
#undef getpwuid
void setpwfile(const char *);
void setpwent(void);
void endpwent(void);
struct passwd *getpwent(void);
struct passwd *getpwnam(const char *);
struct passwd *getpwuid(uid_t);