diff options
author | delphij <delphij@FreeBSD.org> | 2016-12-22 16:19:05 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2016-12-22 16:19:05 +0000 |
commit | a5b8a0cee842e12aa090449e042788b9eabc35da (patch) | |
tree | c763313cbeed3fb4c2eaab81925e4718bb6d5a62 /contrib/ntp/libntp/audio.c | |
parent | 897834470fcc320aaf75dc150ec701ce17c3491a (diff) | |
download | FreeBSD-src-releng/10.1.zip FreeBSD-src-releng/10.1.tar.gz |
Fix multiple vulnerabilities of ntp.releng/10.1
Approved by: so
Diffstat (limited to 'contrib/ntp/libntp/audio.c')
-rw-r--r-- | contrib/ntp/libntp/audio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/ntp/libntp/audio.c b/contrib/ntp/libntp/audio.c index 726dfa9..3b0a0b3 100644 --- a/contrib/ntp/libntp/audio.c +++ b/contrib/ntp/libntp/audio.c @@ -55,7 +55,7 @@ static struct audio_device device; /* audio device ident */ #ifdef PCM_STYLE_SOUND # define INIT_FILE "/etc/ntp.audio" int agc = SOUND_MIXER_WRITE_RECLEV; /* or IGAIN or LINE */ -int monitor = SOUND_MIXER_WRITE_VOLUME; /* or OGAIN */ +int audiomonitor = SOUND_MIXER_WRITE_VOLUME; /* or OGAIN */ int devmask = 0; int recmask = 0; char cf_c_dev[100], cf_i_dev[100], cf_agc[100], cf_monitor[100]; @@ -334,7 +334,7 @@ audio_init( /* devmask */ i = mixer_name(cf_monitor, devmask); if (i >= 0) - monitor = MIXER_WRITE(i); + audiomonitor = MIXER_WRITE(i); else printf("monitor %s not in devmask %#x\n", cf_monitor, devmask); @@ -412,7 +412,7 @@ audio_gain( # endif l |= r << 8; if (cf_monitor[0] != '\0') - rval = ioctl(ctl_fd, monitor, &l ); + rval = ioctl(ctl_fd, audiomonitor, &l ); else rval = ioctl(ctl_fd, SOUND_MIXER_WRITE_VOLUME, &l); |