1 --- libmisc/Makefile.am.orig 2011-11-18 18:23:28.000000000 -0300
2 +++ libmisc/Makefile.am 2012-10-29 19:08:34.000000000 -0300
11 --- src/login.c.orig 2012-05-25 08:51:55.000000000 -0300
12 +++ src/login.c 2012-10-29 19:23:58.000000000 -0300
14 static bool pflg = false;
15 static bool fflg = false;
18 -static bool rflg = false;
22 static bool hflg = false;
23 static bool preauth_flag = false;
28 fprintf (stderr, _(" %s [-p] [-h host] [-f name]\n"), Prog);
30 - fprintf (stderr, _(" %s [-p] -r host\n"), Prog);
55 - * Neither -h nor -f should be combined with -r.
58 - if (rflg && (hflg || fflg)) {
64 * Allow authentication bypass only if real UID is zero.
67 - if ((rflg || fflg || hflg) && !amroot) {
68 + if ((fflg || hflg) && !amroot) {
69 fprintf (stderr, _("%s: Permission denied.\n"), Prog);
77 - if (rflg && (NULL != username)) {
81 if (fflg && (NULL == username)) {
89 - char term[128] = "";
91 #if defined(HAVE_STRFTIME) && !defined(USE_PAM)
95 is_console = console (tty);
101 * Add remote hostname to the environment. I think
102 * (not sure) I saw it once on Irix. --marekm
109 - assert (NULL == username);
110 - username = xmalloc (USER_NAME_MAX_LENGTH + 1);
111 - username[USER_NAME_MAX_LENGTH] = '\0';
112 - if (do_rlogin (hostname, username, USER_NAME_MAX_LENGTH, term, sizeof term)) {
113 - preauth_flag = true;
128 - if (term[0] != '\0') {
129 - addenv ("TERM", term);
133 /* preserve TERM from getty */
136 set_env (argc - optind, &argv[optind]);
139 - if (rflg || hflg) {
142 #ifdef HAVE_STRUCT_UTMP_UT_HOST
143 } else if ((NULL != utent) && ('\0' != utent->ut_host[0])) {
144 @@ -1082,7 +1032,7 @@
145 (void) puts (_("Login incorrect"));
147 /* allow only one attempt with -r or -f */
148 - if (rflg || fflg || (retries <= 0)) {
149 + if (fflg || (retries <= 0)) {