Don't emit an empty sudoRole for global defaults if there are none.

This commit is contained in:
Todd C. Miller
2018-03-02 10:59:19 -07:00
parent e96398cac2
commit 44fc165e7c
4 changed files with 8 additions and 19 deletions

View File

@@ -94,9 +94,16 @@ print_options_ldif(FILE *fp, struct defaults_list *options)
static bool static bool
print_global_defaults_ldif(FILE *fp, const char *base) print_global_defaults_ldif(FILE *fp, const char *base)
{ {
unsigned int count = 0;
struct defaults *opt;
debug_decl(print_global_defaults_ldif, SUDOERS_DEBUG_UTIL) debug_decl(print_global_defaults_ldif, SUDOERS_DEBUG_UTIL)
if (TAILQ_EMPTY(&defaults)) TAILQ_FOREACH(opt, &defaults, entries) {
/* Skip bound Defaults (unsupported). */
if (opt->type == DEFAULTS)
count++;
}
if (count == 0)
debug_return_bool(true); debug_return_bool(true);
fprintf(fp, "dn: cn=defaults,%s\n", base); fprintf(fp, "dn: cn=defaults,%s\n", base);

View File

@@ -1,9 +1,3 @@
dn: cn=defaults,ou=SUDOers,dc=sudo,dc=ws
objectClass: top
objectClass: sudoRole
cn: defaults
description: Default sudoOption's go here
dn: cn=foo,ou=SUDOers,dc=sudo,dc=ws dn: cn=foo,ou=SUDOers,dc=sudo,dc=ws
objectClass: top objectClass: top
objectClass: sudoRole objectClass: sudoRole

View File

@@ -1,6 +0,0 @@
dn: cn=defaults,ou=SUDOers,dc=sudo,dc=ws
objectClass: top
objectClass: sudoRole
cn: defaults
description: Default sudoOption's go here

View File

@@ -1,9 +1,3 @@
dn: cn=defaults,ou=SUDOers,dc=sudo,dc=ws
objectClass: top
objectClass: sudoRole
cn: defaults
description: Default sudoOption's go here
dn: cn=\#0,ou=SUDOers,dc=sudo,dc=ws dn: cn=\#0,ou=SUDOers,dc=sudo,dc=ws
objectClass: top objectClass: top
objectClass: sudoRole objectClass: sudoRole