diff mbox series

[Openvpn-devel,2/2] ntlm: fix discards 'const' qualifier from pointer target type

Message ID aZL3VTPFLX8nHGSR@f4d934329c4f
State New
Headers show
Series None | expand

Commit Message

Rudi Heitbaum Feb. 16, 2026, 10:54 a.m. UTC 
Since glibc-2.43:

For ISO C23, the functions bsearch, memchr, strchr, strpbrk, strrchr,
strstr, wcschr, wcspbrk, wcsrchr, wcsstr and wmemchr that return pointers
into their input arrays now have definitions as macros that return a
pointer to a const-qualified type when the input argument is a pointer
to a const-qualified type.

fixes:
    src/openvpn/ntlm.c: In function 'ntlm_phase_3':
    src/openvpn/ntlm.c:241:15: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
      241 |     separator = strchr(p->up.username, '\\');
          |               ^

Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>

Comments

Gert Doering Feb. 16, 2026, 11:39 a.m. UTC | #1 
Hi,

On Mon, Feb 16, 2026 at 10:54:13AM +0000, Rudi Heitbaum via Openvpn-devel wrote:
> Since glibc-2.43:
> 
> For ISO C23, the functions bsearch, memchr, strchr, strpbrk, strrchr,
> strstr, wcschr, wcspbrk, wcsrchr, wcsstr and wmemchr that return pointers
> into their input arrays now have definitions as macros that return a
> pointer to a const-qualified type when the input argument is a pointer
> to a const-qualified type.
> 
> fixes:
>     src/openvpn/ntlm.c: In function 'ntlm_phase_3':
>     src/openvpn/ntlm.c:241:15: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
>       241 |     separator = strchr(p->up.username, '\\');
>           |               ^
> 
> Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
> 
> diff --git a/src/openvpn/dns.c b/src/openvpn/dns.c
> index c00d4b9c..38739923 100644
> --- a/src/openvpn/dns.c
> +++ b/src/openvpn/dns.c

Not sure how you managed to send the dns.c patch twice, once with the
"ntlm" header...?

Please resend (with a "-v2" tag) and ensure that we get 1x ntlm.c and
1x dns.c :-)

gert
diff mbox series

Patch

diff --git a/src/openvpn/dns.c b/src/openvpn/dns.c
index c00d4b9c..38739923 100644
--- a/src/openvpn/dns.c
+++ b/src/openvpn/dns.c
@@ -45,7 +45,7 @@ 
  * @return              True if parsing was successful
  */
 static bool
-dns_server_port_parse(in_port_t *port, char *port_str)
+dns_server_port_parse(in_port_t *port, const char *port_str)
 {
     char *endptr;
     errno = 0;
@@ -71,8 +71,8 @@  dns_server_addr_parse(struct dns_server *server, const char *addr)
     in_port_t port = 0;
     sa_family_t af;

-    char *first_colon = strchr(addr, ':');
-    char *last_colon = strrchr(addr, ':');
+    const char *first_colon = strchr(addr, ':');
+    const char *last_colon = strrchr(addr, ':');

     if (!first_colon || first_colon == last_colon)
     {
@@ -93,7 +93,7 @@  dns_server_addr_parse(struct dns_server *server, const char *addr)
         if (addr[0] == '[')
         {
             addr += 1;
-            char *bracket = last_colon - 1;
+            const char *bracket = last_colon - 1;
             if (*bracket != ']' || bracket == addr || !dns_server_port_parse(&port, last_colon + 1))
             {
                 return false;
---
 src/openvpn/ntlm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/openvpn/ntlm.c b/src/openvpn/ntlm.c
index 8e913dce..244ee945 100644
--- a/src/openvpn/ntlm.c
+++ b/src/openvpn/ntlm.c
@@ -218,7 +218,7 @@  ntlm_phase_3(const struct http_proxy_info *p, const char *phase_2, struct gc_are
 
     char domain[128];
     char username[128];
-    char *separator;
+    const char *separator;
 
     ASSERT(strlen(p->up.username) > 0);
     ASSERT(strlen(p->up.password) > 0);