ITS#5604

diff --git a/CHANGES b/CHANGES
index 4ba2a5c0cb243796c621c0557c486a0bfafdf34c..f096f6bef004bb00950c338ffc286831d9a1a4f3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 OpenLDAP 2.4 Change Log
 
 OpenLDAP 2.4.12 Engineering
+       Fixed liblutil executables on Windows (ITS#5604)
        Fixed slapd socket closing on Windows (ITS#5606)
        Fixed slapd-ldap,slapd-meta invalid filter behavior (ITS#5614)
        Fixed slapd-meta quarantine behavior (ITS#5592)

diff --git a/libraries/liblutil/utils.c b/libraries/liblutil/utils.c
index 9a7559ff72b1a89f4f0fd9512e2e4259014de7d7..63b0f3802a2b58db4c0be5e1450eb7fe61f34c9a 100644 (file)
--- a/libraries/liblutil/utils.c
+++ b/libraries/liblutil/utils.c
@@ -77,6 +77,13 @@ char* lutil_progname( const char* name, int argc, char *argv[] )
        LUTIL_SLASHPATH( argv[0] );
        progname = strrchr ( argv[0], *LDAP_DIRSEP );
        progname = progname ? &progname[1] : argv[0];
+#ifdef _WIN32
+       {
+               size_t len = strlen( progname );
+               if ( len > 4 && strcasecmp( &progname[len - 4], ".exe" ) == 0 )
+                       progname[len - 4] = '\0';
+       }
+#endif
        return progname;
 }