From f71f133bda3077c835de51e76e83f674d45297ae Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Sat, 27 Oct 2012 12:09:38 +0000 Subject: * dcrt0.cc (quoted): Renamed strechr to strchrnul. * environ.cc (environ_init): Likewise. * sec_acl.cc (aclfromtext32): Likewise. * sec_auth.cc (extract_nt_dom_user): Likewise. * uinfo.cc (pwdgrp::next_str): Likewise. * string.h (strechr): Likewise. --- winsup/cygwin/sec_auth.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'winsup/cygwin/sec_auth.cc') diff --git a/winsup/cygwin/sec_auth.cc b/winsup/cygwin/sec_auth.cc index 26f276b84..15bdf7b7b 100644 --- a/winsup/cygwin/sec_auth.cc +++ b/winsup/cygwin/sec_auth.cc @@ -120,8 +120,8 @@ extract_nt_dom_user (const struct passwd *pw, PWCHAR domain, PWCHAR user) if ((d = strstr (pw->pw_gecos, "U-")) != NULL && (d == pw->pw_gecos || d[-1] == ',')) { - c = strechr (d + 2, ','); - if ((u = strechr (d + 2, '\\')) >= c) + c = strchrnul (d + 2, ','); + if ((u = strchrnul (d + 2, '\\')) >= c) u = d + 1; else if (u - d <= MAX_DOMAIN_NAME_LEN + 2) sys_mbstowcs (domain, MAX_DOMAIN_NAME_LEN + 1, d + 2, u - d - 1); -- cgit v1.2.3