From owner-svn-src-all@FreeBSD.ORG Wed Aug 18 20:39:00 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B5DB10656DF; Wed, 18 Aug 2010 20:39:00 +0000 (UTC) (envelope-from gavin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6A6928FC20; Wed, 18 Aug 2010 20:39:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7IKd0uh079855; Wed, 18 Aug 2010 20:39:00 GMT (envelope-from gavin@svn.freebsd.org) Received: (from gavin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7IKd0vp079853; Wed, 18 Aug 2010 20:39:00 GMT (envelope-from gavin@svn.freebsd.org) Message-Id: <201008182039.o7IKd0vp079853@svn.freebsd.org> From: Gavin Atkinson Date: Wed, 18 Aug 2010 20:39:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r211469 - stable/7/release/picobsd/tinyware/login X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Aug 2010 20:39:00 -0000 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); /*