From 168a9dc22d80b2ee671d72b4da1aa2defa1aaa60 Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Wed, 3 Sep 2008 01:16:28 +0000
Subject: [PATCH] ITS#5604
---
CHANGES | 1 +
libraries/liblutil/utils.c | 7 +++++++
2 files changed, 8 insertions(+)
diff --git a/CHANGES b/CHANGES
index 4ba2a5c0cb..f096f6bef0 100644
--- 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 9a7559ff72..63b0f3802a 100644
--- 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;
}
--
GitLab