display_bound_defaults() stub should return 0, not 1 since it is a count,

not a boolean.

diff --git a/plugins/sudoers/ldap.c b/plugins/sudoers/ldap.c
index 016c831131454230651bb73ac819b217d4b59968..d07e99d6df73dcb53f9b93f5cdd10dad49f054de 100644 (file)
--- a/plugins/sudoers/ldap.c
+++ b/plugins/sudoers/ldap.c
@@ -1150,7 +1150,10 @@ sudo_ldap_display_defaults(nss, pw, lbuf)
     if (rc == LDAP_SUCCESS && (entry = ldap_first_entry(ld, result))) {
        bv = ldap_get_values_len(ld, entry, "sudoOption");
        if (bv != NULL) {
-           prefix = "    ";
+           if (lbuf->len == 0 || isspace((unsigned char)lbuf->buf[lbuf->len - 1]))
+               prefix = "    ";
+           else
+               prefix = ", ";
            for (p = bv; *p != NULL; p++) {
                lbuf_append(lbuf, prefix, (*p)->bv_val, NULL);
                prefix = ", ";
@@ -1173,7 +1176,7 @@ sudo_ldap_display_bound_defaults(nss, pw, lbuf)
     struct passwd *pw;
     struct lbuf *lbuf;
 {
-    return(1);
+    return(0);
 }
 
 /*