From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Mon, 25 Mar 2013 15:17:46 +0000 (-0400)
Subject: Change multiple inclusion guards to be _SUDOERS_FOO_H
X-Git-Tag: SUDO_1_8_7~1^2~147
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a803b4d2ec0af519ed922d8de36b827dbfe9e387;p=sudo

Change multiple inclusion guards to be _SUDOERS_FOO_H
---

diff --git a/plugins/sudoers/bsm_audit.h b/plugins/sudoers/bsm_audit.h
index bd2976409..4ead5de53 100644
--- a/plugins/sudoers/bsm_audit.h
+++ b/plugins/sudoers/bsm_audit.h
@@ -15,10 +15,10 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef _SUDO_BSM_AUDIT_H
-#define	_SUDO_BSM_AUDIT_H
+#ifndef _SUDOERS_BSM_AUDIT_H
+#define	_SUDOERS_BSM_AUDIT_H
 
 void	bsm_audit_success(char **);
 void	bsm_audit_failure(char **, char const * const, va_list);
 
-#endif /* _SUDO_BSM_AUDIT_H */
+#endif /* _SUDOERS_BSM_AUDIT_H */
diff --git a/plugins/sudoers/defaults.h b/plugins/sudoers/defaults.h
index bd8ddf89f..34847b857 100644
--- a/plugins/sudoers/defaults.h
+++ b/plugins/sudoers/defaults.h
@@ -19,8 +19,8 @@
  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
  */
 
-#ifndef _SUDO_DEFAULTS_H
-#define _SUDO_DEFAULTS_H
+#ifndef _SUDOERS_DEFAULTS_H
+#define _SUDOERS_DEFAULTS_H
 
 #include <def_data.h>
 
@@ -113,4 +113,4 @@ bool check_defaults(int what, bool quiet);
 
 extern struct sudo_defs_types sudo_defs_table[];
 
-#endif /* _SUDO_DEFAULTS_H */
+#endif /* _SUDOERS_DEFAULTS_H */
diff --git a/plugins/sudoers/ins_2001.h b/plugins/sudoers/ins_2001.h
index 63a5d6400..604c3e437 100644
--- a/plugins/sudoers/ins_2001.h
+++ b/plugins/sudoers/ins_2001.h
@@ -14,8 +14,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef _SUDO_INS_2001_H
-#define _SUDO_INS_2001_H
+#ifndef _SUDOERS_INS_2001_H
+#define _SUDOERS_INS_2001_H
 
     /*
      * HAL insults (paraphrased) from 2001.
@@ -30,4 +30,4 @@
     "This mission is too important for me to allow you to jeopardize it.",
     "I feel much better now.",
 
-#endif /* _SUDO_INS_2001_H */
+#endif /* _SUDOERS_INS_2001_H */
diff --git a/plugins/sudoers/ins_classic.h b/plugins/sudoers/ins_classic.h
index b1942bd78..3cb35ebd7 100644
--- a/plugins/sudoers/ins_classic.h
+++ b/plugins/sudoers/ins_classic.h
@@ -14,8 +14,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef _SUDO_INS_CLASSIC_H
-#define _SUDO_INS_CLASSIC_H
+#ifndef _SUDOERS_INS_CLASSIC_H
+#define _SUDOERS_INS_CLASSIC_H
 
     /*
      * Insults from the original sudo(8).
@@ -34,4 +34,4 @@
     "Do you think like you type?",
     "Your mind just hasn't been the same since the electro-shock, has it?",
 
-#endif /* _SUDO_INS_CLASSIC_H */
+#endif /* _SUDOERS_INS_CLASSIC_H */
diff --git a/plugins/sudoers/ins_csops.h b/plugins/sudoers/ins_csops.h
index 20e9b02d8..f4ecabd97 100644
--- a/plugins/sudoers/ins_csops.h
+++ b/plugins/sudoers/ins_csops.h
@@ -15,8 +15,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef _SUDO_INS_CSOPS_H
-#define _SUDO_INS_CSOPS_H
+#ifndef _SUDOERS_INS_CSOPS_H
+#define _SUDOERS_INS_CSOPS_H
 
     /*
      * CSOps insults (may be site dependent).
@@ -36,4 +36,4 @@
     "Have you considered trying to match wits with a rutabaga?",
     "You speak an infinite deal of nothing",
 
-#endif /* _SUDO_INS_CSOPS_H */
+#endif /* _SUDOERS_INS_CSOPS_H */
diff --git a/plugins/sudoers/ins_goons.h b/plugins/sudoers/ins_goons.h
index 16a262acc..117393f42 100644
--- a/plugins/sudoers/ins_goons.h
+++ b/plugins/sudoers/ins_goons.h
@@ -14,8 +14,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef _SUDO_INS_GOONS_H
-#define _SUDO_INS_GOONS_H
+#ifndef _SUDOERS_INS_GOONS_H
+#define _SUDOERS_INS_GOONS_H
 
     /*
      * Insults from the "Goon Show."
@@ -45,4 +45,4 @@
     "It's only your word against mine.",
     "I think ... err ... I think ... I think I'll go home",
 
-#endif /* _SUDO_INS_GOONS_H */
+#endif /* _SUDOERS_INS_GOONS_H */
diff --git a/plugins/sudoers/insults.h b/plugins/sudoers/insults.h
index bdb3fc66a..e5d441a7e 100644
--- a/plugins/sudoers/insults.h
+++ b/plugins/sudoers/insults.h
@@ -15,8 +15,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef _SUDO_INSULTS_H
-#define _SUDO_INSULTS_H
+#ifndef _SUDOERS_INSULTS_H
+#define _SUDOERS_INSULTS_H
 
 #if defined(HAL_INSULTS) || defined(GOONS_INSULTS) || defined(CLASSIC_INSULTS) || defined(CSOPS_INSULTS)
 
@@ -58,4 +58,4 @@ char *insults[] = {
 
 #endif /* HAL_INSULTS || GOONS_INSULTS || CLASSIC_INSULTS || CSOPS_INSULTS */
 
-#endif /* _SUDO_INSULTS_H */
+#endif /* _SUDOERS_INSULTS_H */
diff --git a/plugins/sudoers/interfaces.h b/plugins/sudoers/interfaces.h
index 00e69b441..c56e27a82 100644
--- a/plugins/sudoers/interfaces.h
+++ b/plugins/sudoers/interfaces.h
@@ -19,8 +19,8 @@
  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
  */
 
-#ifndef _SUDO_INTERFACES_H
-#define _SUDO_INTERFACES_H
+#ifndef _SUDOERS_INTERFACES_H
+#define _SUDOERS_INTERFACES_H
 
 /*
  * Union to hold either strucr in_addr or in6_add
@@ -50,4 +50,4 @@ void dump_interfaces(const char *);
 void set_interfaces(const char *);
 struct interface *get_interfaces(void);
 
-#endif /* _SUDO_INTERFACES_H */
+#endif /* _SUDOERS_INTERFACES_H */
diff --git a/plugins/sudoers/linux_audit.h b/plugins/sudoers/linux_audit.h
index 8f4d46c7f..3e5b46541 100644
--- a/plugins/sudoers/linux_audit.h
+++ b/plugins/sudoers/linux_audit.h
@@ -14,9 +14,9 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef _SUDO_LINUX_AUDIT_H
-#define	_SUDO_LINUX_AUDIT_H
+#ifndef _SUDOERS_LINUX_AUDIT_H
+#define	_SUDOERS_LINUX_AUDIT_H
 
 int	linux_audit_command(char *argv[], int result);
 
-#endif /* _SUDO_LINUX_AUDIT_H */
+#endif /* _SUDOERS_LINUX_AUDIT_H */
diff --git a/plugins/sudoers/logging.h b/plugins/sudoers/logging.h
index e3f4efd8b..22f559a0d 100644
--- a/plugins/sudoers/logging.h
+++ b/plugins/sudoers/logging.h
@@ -15,8 +15,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef _LOGGING_H
-#define _LOGGING_H
+#ifndef _SUDOERS_LOGGING_H
+#define _SUDOERS_LOGGING_H
 
 #include <syslog.h>
 #ifdef __STDC__
@@ -71,4 +71,4 @@ void log_fatal(int flags, const char *fmt, ...) __printflike(2, 3) __attribute__
 void sudoers_initlocale(const char *ulocale, const char *slocale);
 void writeln_wrap(FILE *fp, char *line, size_t len, size_t maxlen);
 
-#endif /* _LOGGING_H */
+#endif /* _SUDOERS_LOGGING_H */
diff --git a/plugins/sudoers/parse.h b/plugins/sudoers/parse.h
index c5ba73ea7..602231698 100644
--- a/plugins/sudoers/parse.h
+++ b/plugins/sudoers/parse.h
@@ -15,8 +15,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef _SUDO_PARSE_H
-#define _SUDO_PARSE_H
+#ifndef _SUDOERS_PARSE_H
+#define _SUDOERS_PARSE_H
 
 #undef UNSPEC
 #define UNSPEC	-1
@@ -201,4 +201,4 @@ void init_lexer(void);
 void init_parser(const char *, bool);
 int alias_compare(const void *, const void *);
 
-#endif /* _SUDO_PARSE_H */
+#endif /* _SUDOERS_PARSE_H */
diff --git a/plugins/sudoers/pwutil.h b/plugins/sudoers/pwutil.h
index 32d9d04a3..fc61a31af 100644
--- a/plugins/sudoers/pwutil.h
+++ b/plugins/sudoers/pwutil.h
@@ -15,8 +15,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef _PWUTIL_H
-#define _PWUTIL_H
+#ifndef _SUDOERS_PWUTIL_H
+#define _SUDOERS_PWUTIL_H
 
 #define ptr_to_item(p) ((struct cache_item *)((char *)p - offsetof(struct cache_item_##p, p)))
 
@@ -63,4 +63,4 @@ struct cache_item *sudo_make_gritem(gid_t gid, const char *group);
 struct cache_item *sudo_make_grlist_item(struct passwd *pw);
 struct cache_item *sudo_make_pwitem(uid_t uid, const char *user);
 
-#endif /* _PWUTIL_H */
+#endif /* _SUDOERS_PWUTIL_H */
diff --git a/plugins/sudoers/redblack.h b/plugins/sudoers/redblack.h
index eab5e8f26..b1a3cbd61 100644
--- a/plugins/sudoers/redblack.h
+++ b/plugins/sudoers/redblack.h
@@ -14,8 +14,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef _SUDO_REDBLACK_H
-#define _SUDO_REDBLACK_H
+#ifndef _SUDOERS_REDBLACK_H
+#define _SUDOERS_REDBLACK_H
 
 enum rbcolor {
     red,
@@ -54,4 +54,4 @@ struct rbnode *rbinsert(struct rbtree *, void *);
 struct rbtree *rbcreate(int (*)(const void *, const void *));
 void rbdestroy(struct rbtree *, void (*)(void *));
 
-#endif /* _SUDO_REDBLACK_H */
+#endif /* _SUDOERS_REDBLACK_H */
diff --git a/plugins/sudoers/sudo_nss.h b/plugins/sudoers/sudo_nss.h
index dab885d33..394a366f0 100644
--- a/plugins/sudoers/sudo_nss.h
+++ b/plugins/sudoers/sudo_nss.h
@@ -14,8 +14,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef _SUDO_NSS_H
-#define _SUDO_NSS_H
+#ifndef _SUDOERS_NSS_H
+#define _SUDOERS_NSS_H
 
 struct lbuf;
 struct passwd;
@@ -41,4 +41,4 @@ TQ_DECLARE(sudo_nss)
 
 struct sudo_nss_list *sudo_read_nss(void);
 
-#endif /* _SUDO_NSS_H */
+#endif /* _SUDOERS_NSS_H */
diff --git a/plugins/sudoers/sudoers.h b/plugins/sudoers/sudoers.h
index 49c1f1efc..5f6c08899 100644
--- a/plugins/sudoers/sudoers.h
+++ b/plugins/sudoers/sudoers.h
@@ -19,8 +19,8 @@
  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
  */
 
-#ifndef _SUDO_SUDOERS_H
-#define _SUDO_SUDOERS_H
+#ifndef _SUDOERS_SUDOERS_H
+#define _SUDOERS_SUDOERS_H
 
 #include <limits.h>
 #ifdef HAVE_STDBOOL_H
@@ -383,4 +383,4 @@ extern sudo_conv_t sudo_conv;
 extern sudo_printf_t sudo_printf;
 #endif
 
-#endif /* _SUDO_SUDOERS_H */
+#endif /* _SUDOERS_SUDOERS_H */
diff --git a/plugins/sudoers/timestamp.h b/plugins/sudoers/timestamp.h
index b7b73a62c..cfa06f679 100644
--- a/plugins/sudoers/timestamp.h
+++ b/plugins/sudoers/timestamp.h
@@ -19,8 +19,8 @@
  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
  */
 
-#ifndef _SUDO_TIMESTAMP_H
-#define _SUDO_TIMESTAMP_H
+#ifndef _SUDOERS_TIMESTAMP_H
+#define _SUDOERS_TIMESTAMP_H
 
 /* Status codes for timestamp_status() */
 #define TS_CURRENT		0
@@ -44,4 +44,4 @@ bool  update_timestamp(void);
 int   build_timestamp(void);
 int   timestamp_status(void);
 
-#endif /* _SUDO_TIMESTAMP_H */
+#endif /* _SUDOERS_TIMESTAMP_H */
diff --git a/plugins/sudoers/toke.h b/plugins/sudoers/toke.h
index 513dd8fb3..32a896744 100644
--- a/plugins/sudoers/toke.h
+++ b/plugins/sudoers/toke.h
@@ -14,8 +14,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef _SUDO_TOKE_H
-#define _SUDO_TOKE_H
+#ifndef _SUDOERS_TOKE_H
+#define _SUDOERS_TOKE_H
 
 bool append(const char *, int);
 bool fill_args(const char *, int, int);
@@ -39,4 +39,4 @@ extern int (*trace_print)(const char *msg);
 	(*trace_print)(msg);						\
 } while (0);
 
-#endif /* _SUDO_TOKE_H */
+#endif /* _SUDOERS_TOKE_H */