diff --git a/plugins/sudoers/def_data.h b/plugins/sudoers/def_data.h index b510b21db..bbc35c654 100644 --- a/plugins/sudoers/def_data.h +++ b/plugins/sudoers/def_data.h @@ -157,7 +157,7 @@ #define def_iolog_file (sudo_defs_table[78].sd_un.str) #define I_IOLOG_FILE 78 -enum def_tupple { +enum def_tuple { never, once, always, diff --git a/plugins/sudoers/defaults.h b/plugins/sudoers/defaults.h index a269d0205..13291240c 100644 --- a/plugins/sudoers/defaults.h +++ b/plugins/sudoers/defaults.h @@ -53,7 +53,7 @@ struct sudo_defs_types { int flag; int ival; double fval; - enum def_tupple tuple; + enum def_tuple tuple; char *str; mode_t mode; struct list_member *list; diff --git a/plugins/sudoers/ldap.c b/plugins/sudoers/ldap.c index b6d9b5986..c09046f03 100644 --- a/plugins/sudoers/ldap.c +++ b/plugins/sudoers/ldap.c @@ -2059,7 +2059,7 @@ sudo_ldap_lookup(struct sudo_nss *nss, int ret, int pwflag) if (pwflag) { DPRINTF(("perform search for pwflag %d", pwflag), 1); int doauth = UNSPEC; - enum def_tupple pwcheck = + enum def_tuple pwcheck = (pwflag == -1) ? never : sudo_defs_table[pwflag].sd_un.tuple; for (i = 0; i < lres->nentries; i++) { diff --git a/plugins/sudoers/mkdefaults b/plugins/sudoers/mkdefaults index 90f3b0cb8..7befe1588 100755 --- a/plugins/sudoers/mkdefaults +++ b/plugins/sudoers/mkdefaults @@ -88,7 +88,7 @@ $records[$count++] = [$var, $type, $desc, $values, $callback] if defined($var); # Print out value arrays for ($i = 0; $i < $count; $i++) { if (defined($records[$i]->[3])) { - die "Values list specified for non-tupple\n" unless + die "Values list specified for non-tuple\n" unless $records[$i]->[1] =~ /^T_TUPLE/; printf CFILE "static struct def_values def_data_%s[] = {\n", $records[$i]->[0]; foreach (@{$records[$i]->[3]}) { @@ -108,7 +108,7 @@ print CFILE "\tNULL, 0, NULL\n }\n};\n"; # Print out def_tuple if (@tuple_values) { - print HEADER "\nenum def_tupple {\n"; + print HEADER "\nenum def_tuple {\n"; for ($i = 0; $i <= $#tuple_values; $i++) { printf HEADER "\t%s%s\n", $tuple_values[$i], $i != $#tuple_values ? "," : ""; diff --git a/plugins/sudoers/parse.c b/plugins/sudoers/parse.c index ab41b89be..985c4351a 100644 --- a/plugins/sudoers/parse.c +++ b/plugins/sudoers/parse.c @@ -156,7 +156,7 @@ sudo_file_lookup(struct sudo_nss *nss, int validated, int pwflag) */ if (pwflag) { int nopass; - enum def_tupple pwcheck; + enum def_tuple pwcheck; pwcheck = (pwflag == -1) ? never : sudo_defs_table[pwflag].sd_un.tuple; nopass = (pwcheck == all) ? TRUE : FALSE;