diff options
| author | vsevolod <vsevolod@FreeBSD.org> | 2015-03-16 18:52:46 +0800 |
|---|---|---|
| committer | vsevolod <vsevolod@FreeBSD.org> | 2015-03-16 18:52:46 +0800 |
| commit | 1f9b0e7bef73ca3317358f12f9b1e65a660724d9 (patch) | |
| tree | 960c2553626fb3a6e97cc1481a8237b283bc2e86 | |
| parent | b3c1bb3759010c074ad6ca2975a1adb86cba7813 (diff) | |
| download | freebsd-ports-gnome-1f9b0e7bef73ca3317358f12f9b1e65a660724d9.tar.gz freebsd-ports-gnome-1f9b0e7bef73ca3317358f12f9b1e65a660724d9.tar.zst freebsd-ports-gnome-1f9b0e7bef73ca3317358f12f9b1e65a660724d9.zip | |
- Fix build on 8.4.
- Do not bump portrevision: package is unchanged
Submitted by: Eugene Grossbein via IRC
| -rw-r--r-- | net-mgmt/ng_ipacct/files/patch-ng_ipacct.c | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/net-mgmt/ng_ipacct/files/patch-ng_ipacct.c b/net-mgmt/ng_ipacct/files/patch-ng_ipacct.c new file mode 100644 index 000000000000..73540f28cc45 --- /dev/null +++ b/net-mgmt/ng_ipacct/files/patch-ng_ipacct.c @@ -0,0 +1,25 @@ +--- ng_ipacct/ng_ipacct.c.orig 2015-03-16 13:38:23.000000000 +0700 ++++ ng_ipacct/ng_ipacct.c 2015-03-16 13:46:21.000000000 +0700 +@@ -965,7 +965,11 @@ pcb_get_cred(struct ip_acct_stream *r, s + int i; + uid_t res; + ++#if __FreeBSD_version < 900039 ++ INP_INFO_RLOCK(pcbinfo); ++#else + INP_HASH_RLOCK(pcbinfo); ++#endif + for (i = 0, ina = r->r_dst, port = r->r_dport; i < 2; i++) { + #if __FreeBSD_version >= 700110 + pcb = in_pcblookup_local(pcbinfo, ina, port, 1, NOCRED); +@@ -984,6 +988,10 @@ pcb_get_cred(struct ip_acct_stream *r, s + (pcb->inp_socket != NULL) && (pcb->inp_socket->so_cred != NULL)) { + res = pcb->inp_socket->so_cred->cr_uid; + } ++#if __FreeBSD_version < 900039 ++ INP_INFO_RUNLOCK(pcbinfo); ++#else + INP_HASH_RUNLOCK(pcbinfo); ++#endif + return res; + } |