From 15dee8745d0e42f39873fd36a6c92b05f3280a4c Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@courtesan.com>
Date: Mon, 15 Sep 2014 15:11:30 -0600
Subject: [PATCH] Make sudoers file nsswitch functions static to parse.c since
 they are self-contained.

---
 plugins/sudoers/parse.c   | 27 +++++++++++++++++----------
 plugins/sudoers/sudoers.h | 11 -----------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/plugins/sudoers/parse.c b/plugins/sudoers/parse.c
index b3cc4a40a..3da72a751 100644
--- a/plugins/sudoers/parse.c
+++ b/plugins/sudoers/parse.c
@@ -49,7 +49,23 @@
 /* Characters that must be quoted in sudoers */
 #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 = {
     { NULL, NULL },
     sudo_file_open,
@@ -63,15 +79,6 @@ struct sudo_nss sudo_nss_file = {
     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
 sudo_file_open(struct sudo_nss *nss)
 {
diff --git a/plugins/sudoers/sudoers.h b/plugins/sudoers/sudoers.h
index 303924c36..d04201592 100644
--- a/plugins/sudoers/sudoers.h
+++ b/plugins/sudoers/sudoers.h
@@ -248,17 +248,6 @@ int sudo_auth_end_session(struct passwd *pw);
 int sudo_auth_init(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 */
 bool rewind_perms(void);
 bool set_perms(int);
-- 
2.40.0