Date: Tue, 4 Nov 2008 13:44:44 +0000 (UTC) From: Dag-Erling Smorgrav <des@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r184631 - projects/quota64/lib/libutil Message-ID: <200811041344.mA4DiiCa098024@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: des Date: Tue Nov 4 13:44:43 2008 New Revision: 184631 URL: http://svn.freebsd.org/changeset/base/184631 Log: Avoid assigning a const char * to a char *. MFC after: 3 weeks Modified: projects/quota64/lib/libutil/login_cap.c Modified: projects/quota64/lib/libutil/login_cap.c ============================================================================== --- projects/quota64/lib/libutil/login_cap.c Tue Nov 4 13:44:07 2008 (r184630) +++ projects/quota64/lib/libutil/login_cap.c Tue Nov 4 13:44:43 2008 (r184631) @@ -61,6 +61,8 @@ static char * internal_string = NULL; static size_t internal_arraysz = 0; static const char ** internal_array = NULL; +static char path_login_conf[] = _PATH_LOGIN_CONF; + static char * allocstr(const char *str) { @@ -215,15 +217,14 @@ login_getclassbyname(char const *name, c if (dir && snprintf(userpath, MAXPATHLEN, "%s/%s", dir, _FILE_LOGIN_CONF) < MAXPATHLEN) { - login_dbarray[i] = userpath; if (_secure_path(userpath, pwd->pw_uid, pwd->pw_gid) != -1) - i++; /* only use 'secure' data */ + login_dbarray[i++] = userpath; } /* * XXX: Why to add the system database if the class is `me'? */ - if (_secure_path(_PATH_LOGIN_CONF, 0, 0) != -1) - login_dbarray[i++] = _PATH_LOGIN_CONF; + if (_secure_path(path_login_conf, 0, 0) != -1) + login_dbarray[i++] = path_login_conf; login_dbarray[i] = NULL; memset(lc, 0, sizeof(login_cap_t));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811041344.mA4DiiCa098024>