Change multiple inclusion guards to be _SUDOERS_FOO_H

diff --git a/plugins/sudoers/bsm_audit.h b/plugins/sudoers/bsm_audit.h
index bd297640917e71fa3fa1132b655f71860df463cf..4ead5de530d00f538d28c4aa18c0d2ab3c770ce2 100644 (file)
--- 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 bd8ddf89f266345bf8986e452325df1168191b90..34847b85766f9c151701a6a979ee25abeea5a530 100644 (file)
--- 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 63a5d6400b8ade703b8ea1ae4ec96ca87cee0f90..604c3e437c261bdc504cfedb84f902b49b1c1872 100644 (file)
--- 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 b1942bd78397d5c9d1327071d47a64a1428dfc08..3cb35ebd7c3bbcff866cc67aa8acca79ced40f98 100644 (file)
--- 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 20e9b02d8c9bcbe2082a0480dc344ea8590c1330..f4ecabd9718dc690f4681b23658ef13bceb3bd31 100644 (file)
--- 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 16a262acc8e02d5dbf2433d3e48616178ea56ab6..117393f4253e2d9c0d0f749d6afc4d6ec462c3f2 100644 (file)
--- 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 bdb3fc66a56ebbc1d0210c262c5dd4467a1c6b8a..e5d441a7e3e212f8da9123a93e6e6fc62b6520e9 100644 (file)
--- 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 00e69b441a1a07d6b30e1f6761888ccfa01f8348..c56e27a82839a502d78ad6fc5e21b30bcaabb55d 100644 (file)
--- 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 8f4d46c7f83a40d4e5bcc4eaa1c337c3e4d47270..3e5b46541814bbcdd30ca6599138f54e7152f1f0 100644 (file)
--- 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 e3f4efd8bb53d3a88cb289148d3a3fd4cb0c7686..22f559a0dbb32db133feed509db74ee94849dc1b 100644 (file)
--- 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 c5ba73ea7087da97a749a7790bb485209202b074..602231698c21a589bea77b40e0aa965a794fbca2 100644 (file)
--- 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 32d9d04a3a9e541543d9e31f47b20fbd70b9325c..fc61a31afaa9a5b78b5bc3afbee52e0eaf79be42 100644 (file)
--- 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 eab5e8f26722050d7104699ed4f11e50c1d30b04..b1a3cbd61a71e510dd2601380dbf325986f72e7d 100644 (file)
--- 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 dab885d33eb231e06e81b8b03f03ad8a8642f036..394a366f05e5dffa99e877590bcac77325c2d027 100644 (file)
--- 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 49c1f1efc271bb9fc02864a37f548c0784cc4ace..5f6c0889967d097d1bd7948e4a8bfe9a167fbaee 100644 (file)
--- 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 b7b73a62cb1993c32c8293d0c24762f0c0479cab..cfa06f67941a8853755053775d4f2bb24cb15018 100644 (file)
--- 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 513dd8fb393b47e90dbc310fe280bb6bb655d4d0..32a896744c3419c33936c58c68ac98667e3eaa4f 100644 (file)
--- 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 */