The branch main has been updated by imp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=9f3d1a98dd17b9f02912aecab328fd0315d8ef35
commit 9f3d1a98dd17b9f02912aecab328fd0315d8ef35
Author: Warner Losh <i...@freebsd.org>
AuthorDate: 2021-06-02 18:06:13 +0000
Commit: Warner Losh <i...@freebsd.org>
CommitDate: 2021-06-02 19:24:50 +0000
regen after tweaks to getgroups and setgroups
Sponsored by: Netflix
---
sys/kern/systrace_args.c | 8 ++++----
sys/sys/sysproto.h | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c
index 68fe1eff8769..8f8274b1cdac 100644
--- a/sys/kern/systrace_args.c
+++ b/sys/kern/systrace_args.c
@@ -470,7 +470,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int
*n_args)
/* getgroups */
case 79: {
struct getgroups_args *p = params;
- uarg[0] = p->gidsetsize; /* u_int */
+ iarg[0] = p->gidsetsize; /* int */
uarg[1] = (intptr_t)p->gidset; /* gid_t * */
*n_args = 2;
break;
@@ -478,7 +478,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int
*n_args)
/* setgroups */
case 80: {
struct setgroups_args *p = params;
- uarg[0] = p->gidsetsize; /* u_int */
+ iarg[0] = p->gidsetsize; /* int */
uarg[1] = (intptr_t)p->gidset; /* gid_t * */
*n_args = 2;
break;
@@ -4122,7 +4122,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
case 79:
switch (ndx) {
case 0:
- p = "u_int";
+ p = "int";
break;
case 1:
p = "userland gid_t *";
@@ -4135,7 +4135,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
case 80:
switch (ndx) {
case 0:
- p = "u_int";
+ p = "int";
break;
case 1:
p = "userland gid_t *";
diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h
index 66060ab77f9a..83b74f53df5e 100644
--- a/sys/sys/sysproto.h
+++ b/sys/sys/sysproto.h
@@ -284,11 +284,11 @@ struct mincore_args {
char vec_l_[PADL_(char *)]; char * vec; char vec_r_[PADR_(char *)];
};
struct getgroups_args {
- char gidsetsize_l_[PADL_(u_int)]; u_int gidsetsize; char
gidsetsize_r_[PADR_(u_int)];
+ char gidsetsize_l_[PADL_(int)]; int gidsetsize; char
gidsetsize_r_[PADR_(int)];
char gidset_l_[PADL_(gid_t *)]; gid_t * gidset; char
gidset_r_[PADR_(gid_t *)];
};
struct setgroups_args {
- char gidsetsize_l_[PADL_(u_int)]; u_int gidsetsize; char
gidsetsize_r_[PADR_(u_int)];
+ char gidsetsize_l_[PADL_(int)]; int gidsetsize; char
gidsetsize_r_[PADR_(int)];
char gidset_l_[PADL_(gid_t *)]; gid_t * gidset; char
gidset_r_[PADR_(gid_t *)];
};
struct getpgrp_args {
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
