diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2002-06-30 21:54:17 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2002-06-30 21:54:17 +0000 |
| commit | 57e9b5e348f52af2380735d5478f60d5b1b1f69c (patch) | |
| tree | 5df702faad50475525d0410775e5a9b4eccfe3ca /usr.bin/ssh/session.c | |
| parent | a67cfbdaf092d256c5620d46930d3e6eb33d4ed1 (diff) | |
lint asks that we use names that do not overlap
Diffstat (limited to 'usr.bin/ssh/session.c')
| -rw-r--r-- | usr.bin/ssh/session.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/ssh/session.c b/usr.bin/ssh/session.c index 28c6efa96fa..4128bda0b92 100644 --- a/usr.bin/ssh/session.c +++ b/usr.bin/ssh/session.c @@ -33,7 +33,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: session.c,v 1.142 2002/06/26 13:49:26 deraadt Exp $"); +RCSID("$OpenBSD: session.c,v 1.143 2002/06/30 21:54:16 deraadt Exp $"); #include "ssh.h" #include "ssh1.h" @@ -852,13 +852,13 @@ do_setup_env(Session *s, const char *shell) if (!options.use_login) { while (custom_environment) { struct envstring *ce = custom_environment; - char *s = ce->s; + char *str = ce->s; - for (i = 0; s[i] != '=' && s[i]; i++) + for (i = 0; str[i] != '=' && str[i]; i++) ; - if (s[i] == '=') { - s[i] = 0; - child_set_env(&env, &envsize, s, s + i + 1); + if (str[i] == '=') { + str[i] = 0; + child_set_env(&env, &envsize, str, str + i + 1); } custom_environment = ce->next; xfree(ce->s); |