ITS#6754

diff --git a/CHANGES b/CHANGES
index c23223596b8e4ef009adb4c95692eb299a377226..cbc8b2a04f25999ae4d4319fc97d076ac7abf3bb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -34,6 +34,7 @@ OpenLDAP 2.4.24 Engineering
        Fixed slapd config leak with olcDbDirectory (ITS#6634)
        Fixed slapd connectionless warnings (ITS#6747)
        Fixed slapd to free controls if needed (ITS#6629)
+       Fixed slapd to stop if given unknown options (ITS#6754)
        Fixed slapd entry comparisons (ITS#6753)
        Fixed slapd filter leak (ITS#6635)
        Fixed slapd matching rules for strict ordering (ITS#6722)

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 0cb0de16606e73a787e6f3ecac77ca3b8fc36c88..4165cedf88bc368ba3405124c8bcfc38d9c3643d 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -682,6 +682,9 @@ unhandled_option:;
                }
        }
 
+       if ( optind != argc )
+               goto unhandled_option;
+
        ber_set_option(NULL, LBER_OPT_DEBUG_LEVEL, &slap_debug);
        ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, &slap_debug);
        ldif_debug = slap_debug;