From da44557ace24374155edbae6e24aee46d3475ae0 Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Tue, 4 Jan 2011 20:33:07 +0000 Subject: [PATCH] ITS#6754 --- CHANGES | 1 + servers/slapd/main.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGES b/CHANGES index c23223596b..cbc8b2a04f 100644 --- 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 0cb0de1660..4165cedf88 100644 --- 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; -- 2.39.5