Prepare for upcoming POSIXed putenv() rewrite:
don't allow putenv() arg be on the stack, replace putenv() with setenv()
This commit is contained in:
parent
4063583a62
commit
f03351ff2a
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=169121
@ -258,7 +258,7 @@ Spawn(const char *prog, const char *acname, const char *provider,
|
|||||||
struct ng_mesg *rep = (struct ng_mesg *)msgbuf;
|
struct ng_mesg *rep = (struct ng_mesg *)msgbuf;
|
||||||
struct ngpppoe_sts *sts = (struct ngpppoe_sts *)(msgbuf + sizeof *rep);
|
struct ngpppoe_sts *sts = (struct ngpppoe_sts *)(msgbuf + sizeof *rep);
|
||||||
struct ngpppoe_init_data *data;
|
struct ngpppoe_init_data *data;
|
||||||
char env[sizeof(HISMACADDR)+18], unknown[14], sessionid[5], *path;
|
char env[18], unknown[14], sessionid[5], *path;
|
||||||
unsigned char *macaddr;
|
unsigned char *macaddr;
|
||||||
const char *msg;
|
const char *msg;
|
||||||
int ret, slen;
|
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 */
|
/* Put the peer's MAC address in the environment */
|
||||||
if (sz >= sizeof(struct ether_header)) {
|
if (sz >= sizeof(struct ether_header)) {
|
||||||
macaddr = ((struct ether_header *)request)->ether_shost;
|
macaddr = ((struct ether_header *)request)->ether_shost;
|
||||||
snprintf(env, sizeof(env), "%s=%x:%x:%x:%x:%x:%x", HISMACADDR,
|
snprintf(env, sizeof(env), "%x:%x:%x:%x:%x:%x",
|
||||||
macaddr[0], macaddr[1], macaddr[2], macaddr[3], macaddr[4],
|
macaddr[0], macaddr[1], macaddr[2], macaddr[3], macaddr[4],
|
||||||
macaddr[5]);
|
macaddr[5]);
|
||||||
if (putenv(env) != 0)
|
if (setenv(HISMACADDR, env, 1) != 0)
|
||||||
syslog(LOG_INFO, "putenv: cannot set %s: %m", env);
|
syslog(LOG_INFO, "setenv: cannot set %s: %m", HISMACADDR);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* And send our request data to the waiting node */
|
/* And send our request data to the waiting node */
|
||||||
|
Loading…
Reference in New Issue
Block a user