Skip to content

Added freebsd support for timestamp (persist) #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
leath-dub wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added freebsd support for timestamp (persist) #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,9 @@ int main(void) {
persistmethod() {
[ -z "$WITHOUT_TIMESTAMP" ] && {
printf '#define USE_TIMESTAMP\n' >>$CONFIG_H
printf '#ifdef __freebsd__\n' >>$CONFIG_H
printf '# define TIMESTAMP_DIR "/var/run/doas"\n' >>$CONFIG_H
printf '#endif\n' >>$CONFIG_H
printf 'SRCS += timestamp.c\n' >>$CONFIG_MK
printf 'timestamp\n'
return 0
Expand Down
27 changes: 25 additions & 2 deletions timestamp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,10 @@

#include <sys/ioctl.h>
#include <sys/stat.h>
#include <sys/vfs.h>
#ifndef __freebsd__
# include <sys/vfs.h>
#endif


#if !defined(timespecisset) || \
!defined(timespeccmp) || \
Expand Down Expand Up @@ -95,7 +98,22 @@
# endif
#endif

#ifdef __linux__
#if defined(__freebsd__)
#include <sys/types.h>
#include <sys/user.h>
#include <libutil.h>
#include <stdio.h>

static int
proc_info(pid_t pid, int *ttynr, unsigned long long *starttime)
{
struct kinfo_proc *ki = kinfo_getproc(pid);
*ttynr = ki->ki_tdev;
*starttime = ki->ki_start.tv_usec;
free(ki);
return 0;
}
#elif defined(__linux__)
/* Use tty_nr from /proc/self/stat instead of using
* ttyname(3), stdin, stdout and stderr are user
* controllable and would allow to reuse timestamps
Expand Down Expand Up @@ -221,8 +239,13 @@ timestamp_check(int fd, int secs)

if (fstat(fd, &st) == -1)
err(1, "fstat");
#ifdef __freebsd__
if (st.st_uid != 0 || st.st_gid != 0 || st.st_mode != (S_IFREG | 0000))
errx(1, "timestamp uid, gid or mode wrong");
#else
if (st.st_uid != 0 || st.st_gid != getgid() || st.st_mode != (S_IFREG | 0000))
errx(1, "timestamp uid, gid or mode wrong");
#endif

/* this timestamp was created but never set, invalid but no error */
if (!timespecisset(&st.st_atim) || !timespecisset(&st.st_mtim))
Expand Down