isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sudoers file nsswitch functions static to parse.c since they

Browse Source 
are self-contained.
This commit is contained in:
Todd C. Miller
2014-09-15 15:11:30 -06:00
parent f9ac177763
commit 15dee8745d
2 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
plugins/sudoers/parse.c
View File

@@ -49,7 +49,23 @@
/* Characters that must be quoted in sudoers */ /* Characters that must be quoted in sudoers */
#define SUDOERS_QUOTED ":\\,=#\"" #define SUDOERS_QUOTED ":\\,=#\""
/* sudoers nsswitch routines */ /*
* Local prototypes.
*/
static int display_bound_defaults(int dtype, struct sudo_lbuf *lbuf);
static int sudo_file_close(struct sudo_nss *);
static int sudo_file_display_bound_defaults(struct sudo_nss *, struct passwd *, struct sudo_lbuf *);
static int sudo_file_display_cmnd(struct sudo_nss *, struct passwd *);
static int sudo_file_display_defaults(struct sudo_nss *, struct passwd *, struct sudo_lbuf *);
static int sudo_file_display_privs(struct sudo_nss *, struct passwd *, struct sudo_lbuf *);
static int sudo_file_lookup(struct sudo_nss *, int, int);
static int sudo_file_open(struct sudo_nss *);
static int sudo_file_parse(struct sudo_nss *);
static int sudo_file_setdefs(struct sudo_nss *);
static void print_member(struct sudo_lbuf *lbuf, struct member *m, int alias_type);
static void print_member2(struct sudo_lbuf *lbuf, struct member *m, const char *separator, int alias_type);
/* sudo_nss implementation */
struct sudo_nss sudo_nss_file = { struct sudo_nss sudo_nss_file = {
{ NULL, NULL }, { NULL, NULL },
sudo_file_open, sudo_file_open,
@@ -63,15 +79,6 @@ struct sudo_nss sudo_nss_file = {
sudo_file_display_privs sudo_file_display_privs
}; };
/*
* Local prototypes.
*/
static int display_bound_defaults(int dtype, struct sudo_lbuf *lbuf);
static void print_member(struct sudo_lbuf *lbuf, struct member *m,
int alias_type);
static void print_member2(struct sudo_lbuf *lbuf, struct member *m,
const char *separator, int alias_type);
int int
sudo_file_open(struct sudo_nss *nss) sudo_file_open(struct sudo_nss *nss)
{ {

11
plugins/sudoers/sudoers.h
View File

@@ -248,17 +248,6 @@ int sudo_auth_end_session(struct passwd *pw);
int sudo_auth_init(struct passwd *pw); int sudo_auth_init(struct passwd *pw);
int sudo_auth_cleanup(struct passwd *pw); int sudo_auth_cleanup(struct passwd *pw);
/* parse.c */
int sudo_file_open(struct sudo_nss *);
int sudo_file_close(struct sudo_nss *);
int sudo_file_setdefs(struct sudo_nss *);
int sudo_file_lookup(struct sudo_nss *, int, int);
int sudo_file_parse(struct sudo_nss *);
int sudo_file_display_cmnd(struct sudo_nss *, struct passwd *);
int sudo_file_display_defaults(struct sudo_nss *, struct passwd *, struct sudo_lbuf *);
int sudo_file_display_bound_defaults(struct sudo_nss *, struct passwd *, struct sudo_lbuf *);
int sudo_file_display_privs(struct sudo_nss *, struct passwd *, struct sudo_lbuf *);
/* set_perms.c */ /* set_perms.c */
bool rewind_perms(void); bool rewind_perms(void);
bool set_perms(int); bool set_perms(int);