Date: Sun, 8 Aug 2010 16:55:27 +0000 (UTC) From: Gavin Atkinson <gavin@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r211079 - head/release/picobsd/tinyware/login Message-ID: <201008081655.o78GtR4D024064@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gavin Date: Sun Aug 8 16:55:27 2010 New Revision: 211079 URL: http://svn.freebsd.org/changeset/base/211079 Log: Merge r114010 of head/usr.bin/login/login.c into PicoBSD's login.c: Correct the login.conf variable name used for obtaining the login prompt. PR: conf/44717 (indirectly) Spotted by: gcooper MFC after: 1 week Modified: head/release/picobsd/tinyware/login/pico-login.c Modified: head/release/picobsd/tinyware/login/pico-login.c ============================================================================== --- head/release/picobsd/tinyware/login/pico-login.c Sun Aug 8 16:52:47 2010 (r211078) +++ head/release/picobsd/tinyware/login/pico-login.c Sun Aug 8 16:55:27 2010 (r211079) @@ -279,7 +279,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,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008081655.o78GtR4D024064>