faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sys_netbsd: don't check access to /dev/clockctl with -x

Browse source 
With the -x option there is no need for write access to /dev/clockctl.
This commit is contained in:
Miroslav Lichvar 2020-10-05 18:25:50 +02:00
parent 8e9716d5d4
commit e4cccc115d
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys.c
View file

@ -104,7 +104,7 @@ void SYS_DropRoot(uid_t uid, gid_t gid, SYS_ProcessContext context)
#elif defined(SOLARIS) && defined(FEAT_PRIVDROP) #elif defined(SOLARIS) && defined(FEAT_PRIVDROP)
SYS_Solaris_DropRoot(uid, gid, context); SYS_Solaris_DropRoot(uid, gid, context);
#elif (defined(NETBSD) || defined(FREEBSD)) && defined(FEAT_PRIVDROP) #elif (defined(NETBSD) || defined(FREEBSD)) && defined(FEAT_PRIVDROP)
SYS_NetBSD_DropRoot(uid, gid, context); SYS_NetBSD_DropRoot(uid, gid, context, !null_driver);
#elif defined(MACOSX) && defined(FEAT_PRIVDROP) #elif defined(MACOSX) && defined(FEAT_PRIVDROP)
SYS_MacOSX_DropRoot(uid, gid, context); SYS_MacOSX_DropRoot(uid, gid, context);
#else #else

5
sys_netbsd.c
View file

@ -131,7 +131,7 @@ SYS_NetBSD_Finalise(void)
#ifdef FEAT_PRIVDROP #ifdef FEAT_PRIVDROP
void void
SYS_NetBSD_DropRoot(uid_t uid, gid_t gid, SYS_ProcessContext context) SYS_NetBSD_DropRoot(uid_t uid, gid_t gid, SYS_ProcessContext context, int clock_control)
{ {
#ifdef NETBSD #ifdef NETBSD
int fd; int fd;
@ -145,6 +145,9 @@ SYS_NetBSD_DropRoot(uid_t uid, gid_t gid, SYS_ProcessContext context)
UTI_DropRoot(uid, gid); UTI_DropRoot(uid, gid);
#ifdef NETBSD #ifdef NETBSD
if (!clock_control)
return;
/* Check if we have write access to /dev/clockctl */ /* Check if we have write access to /dev/clockctl */
fd = open("/dev/clockctl", O_WRONLY); fd = open("/dev/clockctl", O_WRONLY);
if (fd < 0) if (fd < 0)

2
sys_netbsd.h
View file

@ -34,6 +34,6 @@ void SYS_NetBSD_Initialise(void);
void SYS_NetBSD_Finalise(void); void SYS_NetBSD_Finalise(void);
void SYS_NetBSD_DropRoot(uid_t uid, gid_t gid, SYS_ProcessContext context); void SYS_NetBSD_DropRoot(uid_t uid, gid_t gid, SYS_ProcessContext context, int clock_control);
#endif #endif