Allow sudo to be build with sss support without also including ldap

support.  From Stephane Graber.

diff --git a/doc/CONTRIBUTORS b/doc/CONTRIBUTORS
index 27544619235460ed71f01e201a832e116e6c25df..fe5db7cfab28534e730fa869943286a9afd818f3 100644 (file)
--- a/doc/CONTRIBUTORS
+++ b/doc/CONTRIBUTORS
@@ -45,6 +45,7 @@ you believe you should be listed, please send a note to sudo@sudo.ws.
     Marc Espie
     Ariel Faigon
     Brian Farrell
+    Stephane Graber
     Steve Fobes
     Mike Frysinger
     Jean-loup Gailly

diff --git a/plugins/sudoers/sudo_nss.c b/plugins/sudoers/sudo_nss.c
index da3333f1080e52e2592eb31f7c1a77b2665aa1d5..83a3fe912a5d51794a198c8b697a1b62498a5309 100644 (file)
--- a/plugins/sudoers/sudo_nss.c
+++ b/plugins/sudoers/sudo_nss.c
@@ -89,9 +89,11 @@ sudo_read_nss(void)
            if (strcasecmp(cp, "files") == 0 && !saw_files) {
                tq_append(&snl, &sudo_nss_file);
                got_match = true;
+#ifdef HAVE_LDAP
            } else if (strcasecmp(cp, "ldap") == 0 && !saw_ldap) {
                tq_append(&snl, &sudo_nss_ldap);
                got_match = true;
+#endif
 #ifdef HAVE_SSSD
            } else if (strcasecmp(cp, "sss") == 0 && !saw_sss) {
                tq_append(&snl, &sudo_nss_sss);
@@ -171,11 +173,13 @@ sudo_read_nss(void)
                tq_append(&snl, &sudo_nss_file);
                got_match = true;
                ep = &cp[5];
+#ifdef HAVE_LDAP
            } else if (!saw_ldap && strncasecmp(cp, "ldap", 4) == 0 &&
                (isspace((unsigned char)cp[4]) || cp[4] == '\0')) {
                tq_append(&snl, &sudo_nss_ldap);
                got_match = true;
                ep = &cp[4];
+#endif
 #ifdef HAVE_SSSD
            } else if (!saw_sss && strncasecmp(cp, "sss", 3) == 0 &&
                (isspace((unsigned char)cp[3]) || cp[3] == '\0')) {