Date: Wed, 18 Aug 2010 20:39:00 +0000 (UTC) From: Gavin Atkinson <gavin@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r211469 - stable/7/release/picobsd/tinyware/login Message-ID: <201008182039.o7IKd0vp079853@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gavin Date: Wed Aug 18 20:39:00 2010 New Revision: 211469 URL: http://svn.freebsd.org/changeset/base/211469 Log: Merge r211077, r211079 from head: Correct two error messages to match the failure they are reporting. Correct the login.conf variable name used for obtaining the login prompt. Modified: stable/7/release/picobsd/tinyware/login/pico-login.c Directory Properties: stable/7/release/picobsd/tinyware/login/ (props changed) Modified: stable/7/release/picobsd/tinyware/login/pico-login.c ============================================================================== --- stable/7/release/picobsd/tinyware/login/pico-login.c Wed Aug 18 20:38:47 2010 (r211468) +++ stable/7/release/picobsd/tinyware/login/pico-login.c Wed Aug 18 20:39:00 2010 (r211469) @@ -278,7 +278,8 @@ main(argc, argv) * Get "login-retries" & "login-backoff" from default class */ lc = login_getclass(NULL); - prompt = login_getcapstr(lc, "prompt", DEFAULT_PROMPT, DEFAULT_PROMPT); + prompt = login_getcapstr(lc, "login_prompt", + DEFAULT_PROMPT, DEFAULT_PROMPT); passwd_prompt = login_getcapstr(lc, "passwd_prompt", DEFAULT_PASSWD_PROMPT, DEFAULT_PASSWD_PROMPT); retries = login_getcapnum(lc, "login-retries", DEFAULT_RETRIES, @@ -533,10 +534,10 @@ main(argc, argv) * devices, we just clear them. */ if (chflags(ttyn, 0) && errno != EOPNOTSUPP) - syslog(LOG_ERR, "chmod(%s): %m", ttyn); + syslog(LOG_ERR, "chflags(%s): %m", ttyn); if (chown(ttyn, pwd->pw_uid, (gr = getgrnam(TTYGRPNAME)) ? gr->gr_gid : pwd->pw_gid)) - syslog(LOG_ERR, "chmod(%s): %m", ttyn); + syslog(LOG_ERR, "chown(%s): %m", ttyn); /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008182039.o7IKd0vp079853>