diff options
author | ache <ache@FreeBSD.org> | 2007-05-01 16:02:44 +0000 |
---|---|---|
committer | ache <ache@FreeBSD.org> | 2007-05-01 16:02:44 +0000 |
commit | 6ccaf050cc62bc9d81ac3acb71ce640739caa0f7 (patch) | |
tree | e3e0b3658b8df3a905b3117d8535bb15f42c9e80 /libexec | |
parent | 61e9800ad7707590037d6868c703475f36cf7058 (diff) | |
download | FreeBSD-src-6ccaf050cc62bc9d81ac3acb71ce640739caa0f7.zip FreeBSD-src-6ccaf050cc62bc9d81ac3acb71ce640739caa0f7.tar.gz |
Back out all POSIXified *env() changes.
Not because I admit they are technically wrong and not because of bug
reports (I receive nothing). But because I surprisingly meets so
strong opposition and resistance so lost any desire to continue that.
Anyone who interested in POSIX can dig out what changes and how
through cvs diffs.
Diffstat (limited to 'libexec')
-rw-r--r-- | libexec/pppoed/pppoed.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libexec/pppoed/pppoed.c b/libexec/pppoed/pppoed.c index dc87896..8dfebb7 100644 --- a/libexec/pppoed/pppoed.c +++ b/libexec/pppoed/pppoed.c @@ -258,7 +258,7 @@ Spawn(const char *prog, const char *acname, const char *provider, struct ng_mesg *rep = (struct ng_mesg *)msgbuf; struct ngpppoe_sts *sts = (struct ngpppoe_sts *)(msgbuf + sizeof *rep); struct ngpppoe_init_data *data; - char env[18], unknown[14], sessionid[5], *path; + char env[sizeof(HISMACADDR)+18], unknown[14], sessionid[5], *path; unsigned char *macaddr; const char *msg; int ret, slen; @@ -352,11 +352,11 @@ Spawn(const char *prog, const char *acname, const char *provider, /* Put the peer's MAC address in the environment */ if (sz >= sizeof(struct ether_header)) { macaddr = ((struct ether_header *)request)->ether_shost; - snprintf(env, sizeof(env), "%x:%x:%x:%x:%x:%x", + snprintf(env, sizeof(env), "%s=%x:%x:%x:%x:%x:%x", HISMACADDR, macaddr[0], macaddr[1], macaddr[2], macaddr[3], macaddr[4], macaddr[5]); - if (setenv(HISMACADDR, env, 1) != 0) - syslog(LOG_INFO, "setenv: cannot set %s: %m", HISMACADDR); + if (putenv(env) != 0) + syslog(LOG_INFO, "putenv: cannot set %s: %m", env); } /* And send our request data to the waiting node */ |