From b09b677166eb973948f189184e6ae4f60dafb2b9 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Tue, 22 Jun 2004 15:06:46 +1000 Subject: - dtucker@cvs.openbsd.org 2004/06/22 05:05:45 [monitor.c monitor_wrap.c] Change login->username, will prevent -Wshadow errors in Portable; ok markus@ --- ChangeLog | 6 +++++- monitor.c | 14 +++++++------- monitor_wrap.c | 6 +++--- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index f5a1b14c7..929418433 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,10 @@ - markus@cvs.openbsd.org 2004/06/22 03:12:13 [regress/envpass.sh regress/multiplex.sh] more portable env passing tests + - dtucker@cvs.openbsd.org 2004/06/22 05:05:45 + [monitor.c monitor_wrap.c] + Change login->username, will prevent -Wshadow errors in Portable; + ok markus@ - (dtucker) [monitor.c] Fix Portable-specific -Wshadow warnings on "socket". - (dtucker) [defines.h] Define __dead if not already defined. @@ -1365,4 +1369,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3431 2004/06/22 03:38:56 dtucker Exp $ +$Id: ChangeLog,v 1.3432 2004/06/22 05:06:46 dtucker Exp $ diff --git a/monitor.c b/monitor.c index f9806e01c..3f468dfff 100644 --- a/monitor.c +++ b/monitor.c @@ -25,7 +25,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: monitor.c,v 1.59 2004/06/21 17:36:31 avsm Exp $"); +RCSID("$OpenBSD: monitor.c,v 1.60 2004/06/22 05:05:45 dtucker Exp $"); #include @@ -551,7 +551,7 @@ mm_answer_sign(int sock, Buffer *m) int mm_answer_pwnamallow(int sock, Buffer *m) { - char *login; + char *username; struct passwd *pwent; int allowed = 0; @@ -560,13 +560,13 @@ mm_answer_pwnamallow(int sock, Buffer *m) if (authctxt->attempt++ != 0) fatal("%s: multiple attempts for getpwnam", __func__); - login = buffer_get_string(m, NULL); + username = buffer_get_string(m, NULL); - pwent = getpwnamallow(login); + pwent = getpwnamallow(username); - authctxt->user = xstrdup(login); - setproctitle("%s [priv]", pwent ? login : "unknown"); - xfree(login); + authctxt->user = xstrdup(username); + setproctitle("%s [priv]", pwent ? username : "unknown"); + xfree(username); buffer_clear(m); diff --git a/monitor_wrap.c b/monitor_wrap.c index d9cbd9e32..0f5ecaaee 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c @@ -25,7 +25,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: monitor_wrap.c,v 1.36 2004/06/21 17:36:31 avsm Exp $"); +RCSID("$OpenBSD: monitor_wrap.c,v 1.37 2004/06/22 05:05:45 dtucker Exp $"); #include #include @@ -194,7 +194,7 @@ mm_key_sign(Key *key, u_char **sigp, u_int *lenp, u_char *data, u_int datalen) } struct passwd * -mm_getpwnamallow(const char *login) +mm_getpwnamallow(const char *username) { Buffer m; struct passwd *pw; @@ -203,7 +203,7 @@ mm_getpwnamallow(const char *login) debug3("%s entering", __func__); buffer_init(&m); - buffer_put_cstring(&m, login); + buffer_put_cstring(&m, username); mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PWNAM, &m); -- cgit v1.2.3