Date: Sun, 3 Jan 2016 18:42:52 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r293113 - in user/ngie/stable-10-libnv: . contrib/bsnmp/snmpd contrib/pf/pflogd lib/libc/net share/mk sys/contrib/ipfilter/netinet sys/kern sys/sys usr.sbin/makefs Message-ID: <201601031842.u03IgqJ2003207@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sun Jan 3 18:42:52 2016 New Revision: 293113 URL: https://svnweb.freebsd.org/changeset/base/293113 Log: MFstable/10 @ r293112 Modified: user/ngie/stable-10-libnv/COPYRIGHT user/ngie/stable-10-libnv/contrib/bsnmp/snmpd/action.c user/ngie/stable-10-libnv/contrib/pf/pflogd/pflogd.c user/ngie/stable-10-libnv/lib/libc/net/gethostbynis.c user/ngie/stable-10-libnv/lib/libc/net/netdb_private.h user/ngie/stable-10-libnv/share/mk/bsd.compiler.mk user/ngie/stable-10-libnv/sys/contrib/ipfilter/netinet/ip_nat.c user/ngie/stable-10-libnv/sys/kern/link_elf.c user/ngie/stable-10-libnv/sys/sys/copyright.h user/ngie/stable-10-libnv/usr.sbin/makefs/makefs.c Directory Properties: user/ngie/stable-10-libnv/ (props changed) Modified: user/ngie/stable-10-libnv/COPYRIGHT ============================================================================== --- user/ngie/stable-10-libnv/COPYRIGHT Sun Jan 3 18:09:46 2016 (r293112) +++ user/ngie/stable-10-libnv/COPYRIGHT Sun Jan 3 18:42:52 2016 (r293113) @@ -4,7 +4,7 @@ The compilation of software known as FreeBSD is distributed under the following terms: -Copyright (c) 1992-2015 The FreeBSD Project. All rights reserved. +Copyright (c) 1992-2016 The FreeBSD Project. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions Modified: user/ngie/stable-10-libnv/contrib/bsnmp/snmpd/action.c ============================================================================== --- user/ngie/stable-10-libnv/contrib/bsnmp/snmpd/action.c Sun Jan 3 18:09:46 2016 (r293112) +++ user/ngie/stable-10-libnv/contrib/bsnmp/snmpd/action.c Sun Jan 3 18:42:52 2016 (r293113) @@ -60,29 +60,6 @@ static const struct asn_oid #endif /* - * Get a string value from the KERN sysctl subtree. - */ -static char * -act_getkernstring(int id) -{ - int mib[2]; - size_t len; - char *string; - - mib[0] = CTL_KERN; - mib[1] = id; - if (sysctl(mib, 2, NULL, &len, NULL, 0) != 0) - return (NULL); - if ((string = malloc(len)) == NULL) - return (NULL); - if (sysctl(mib, 2, string, &len, NULL, 0) != 0) { - free(string); - return (NULL); - } - return (string); -} - -/* * Get an integer value from the KERN sysctl subtree. */ static char * Modified: user/ngie/stable-10-libnv/contrib/pf/pflogd/pflogd.c ============================================================================== --- user/ngie/stable-10-libnv/contrib/pf/pflogd/pflogd.c Sun Jan 3 18:09:46 2016 (r293112) +++ user/ngie/stable-10-libnv/contrib/pf/pflogd/pflogd.c Sun Jan 3 18:42:52 2016 (r293113) @@ -766,7 +766,7 @@ main(int argc, char **argv) np = pcap_dispatch(hpcap, PCAP_NUM_PKTS, phandler, (u_char *)dpcap); if (np < 0) { - if (!if_exists(interface) == -1) { + if (!if_exists(interface)) { logmsg(LOG_NOTICE, "interface %s went away", interface); ret = -1; Modified: user/ngie/stable-10-libnv/lib/libc/net/gethostbynis.c ============================================================================== --- user/ngie/stable-10-libnv/lib/libc/net/gethostbynis.c Sun Jan 3 18:09:46 2016 (r293112) +++ user/ngie/stable-10-libnv/lib/libc/net/gethostbynis.c Sun Jan 3 18:42:52 2016 (r293113) @@ -198,61 +198,6 @@ _gethostbynisaddr_r(const void *addr, so } #endif /* YP */ -/* XXX _gethostbynisname/_gethostbynisaddr only used by getipnodeby*() */ -struct hostent * -_gethostbynisname(const char *name, int af) -{ -#ifdef YP - struct hostent *he; - struct hostent_data *hed; - u_long oresopt; - int error; - res_state statp; - - statp = __res_state(); - if ((he = __hostent_init()) == NULL || - (hed = __hostent_data_init()) == NULL) { - RES_SET_H_ERRNO(statp, NETDB_INTERNAL); - return (NULL); - } - - oresopt = statp->options; - statp->options &= ~RES_USE_INET6; - error = _gethostbynisname_r(name, af, he, hed); - statp->options = oresopt; - return (error == 0) ? he : NULL; -#else - return (NULL); -#endif -} - -struct hostent * -_gethostbynisaddr(const void *addr, socklen_t len, int af) -{ -#ifdef YP - struct hostent *he; - struct hostent_data *hed; - u_long oresopt; - int error; - res_state statp; - - statp = __res_state(); - if ((he = __hostent_init()) == NULL || - (hed = __hostent_data_init()) == NULL) { - RES_SET_H_ERRNO(statp, NETDB_INTERNAL); - return (NULL); - } - - oresopt = statp->options; - statp->options &= ~RES_USE_INET6; - error = _gethostbynisaddr_r(addr, len, af, he, hed); - statp->options = oresopt; - return (error == 0) ? he : NULL; -#else - return (NULL); -#endif -} - int _nis_gethostbyname(void *rval, void *cb_data, va_list ap) { Modified: user/ngie/stable-10-libnv/lib/libc/net/netdb_private.h ============================================================================== --- user/ngie/stable-10-libnv/lib/libc/net/netdb_private.h Sun Jan 3 18:09:46 2016 (r293112) +++ user/ngie/stable-10-libnv/lib/libc/net/netdb_private.h Sun Jan 3 18:42:52 2016 (r293113) @@ -133,8 +133,6 @@ void _endhostdnsent(void); void _endhosthtent(struct hostent_data *); void _endnetdnsent(void); void _endnethtent(struct netent_data *); -struct hostent *_gethostbynisaddr(const void *, socklen_t, int); -struct hostent *_gethostbynisname(const char *, int); void _map_v4v6_address(const char *, char *); void _map_v4v6_hostent(struct hostent *, char **, char *); void _sethostdnsent(int); Modified: user/ngie/stable-10-libnv/share/mk/bsd.compiler.mk ============================================================================== --- user/ngie/stable-10-libnv/share/mk/bsd.compiler.mk Sun Jan 3 18:09:46 2016 (r293112) +++ user/ngie/stable-10-libnv/share/mk/bsd.compiler.mk Sun Jan 3 18:42:52 2016 (r293113) @@ -40,7 +40,7 @@ COMPILER_TYPE:= clang . endif .endif .if !defined(COMPILER_VERSION) -COMPILER_VERSION!=echo ${_v:M[1-9].[0-9]*} | awk -F. '{print $$1 * 10000 + $$2 * 100 + $$3;}' +COMPILER_VERSION!=echo "${_v:M[1-9].[0-9]*}" | awk -F. '{print $$1 * 10000 + $$2 * 100 + $$3;}' .endif .undef _v .endif Modified: user/ngie/stable-10-libnv/sys/contrib/ipfilter/netinet/ip_nat.c ============================================================================== --- user/ngie/stable-10-libnv/sys/contrib/ipfilter/netinet/ip_nat.c Sun Jan 3 18:09:46 2016 (r293112) +++ user/ngie/stable-10-libnv/sys/contrib/ipfilter/netinet/ip_nat.c Sun Jan 3 18:42:52 2016 (r293113) @@ -5235,7 +5235,7 @@ ipf_nat_out(fin, nat, natadd, nflags) uh->uh_ulen += fin->fin_plen; uh->uh_ulen = htons(uh->uh_ulen); #if !defined(_KERNEL) || defined(MENTAT) || defined(__sgi) || \ - defined(linux) || defined(BRIDGE_IPF) || defined(__FreeBSD) + defined(linux) || defined(BRIDGE_IPF) || defined(__FreeBSD__) ipf_fix_outcksum(0, &ip->ip_sum, sumd, 0); #endif Modified: user/ngie/stable-10-libnv/sys/kern/link_elf.c ============================================================================== --- user/ngie/stable-10-libnv/sys/kern/link_elf.c Sun Jan 3 18:09:46 2016 (r293112) +++ user/ngie/stable-10-libnv/sys/kern/link_elf.c Sun Jan 3 18:42:52 2016 (r293113) @@ -575,7 +575,7 @@ parse_dynamic(elf_file_t ef) static int parse_dpcpu(elf_file_t ef) -{ +{ int count; int error; @@ -606,7 +606,7 @@ parse_dpcpu(elf_file_t ef) #ifdef VIMAGE static int parse_vnet(elf_file_t ef) -{ +{ int count; int error; @@ -872,7 +872,7 @@ link_elf_load_file(linker_class_t cls, c */ base_offset = trunc_page(segs[0]->p_offset); base_vaddr = trunc_page(segs[0]->p_vaddr); - base_vlimit = round_page(segs[nsegs - 1]->p_vaddr + + base_vlimit = round_page(segs[nsegs - 1]->p_vaddr + segs[nsegs - 1]->p_memsz); mapsize = base_vlimit - base_vaddr; @@ -1416,7 +1416,7 @@ link_elf_each_function_name(linker_file_ elf_file_t ef = (elf_file_t)file; const Elf_Sym *symp; int i, error; - + /* Exhaustive search */ for (i = 0, symp = ef->ddbsymtab; i < ef->ddbsymcnt; i++, symp++) { if (symp->st_value != 0 && @@ -1602,7 +1602,7 @@ link_elf_symtab_get(linker_file_t lf, co return (ef->ddbsymcnt); } - + static long link_elf_strtab_get(linker_file_t lf, caddr_t *strtab) { Modified: user/ngie/stable-10-libnv/sys/sys/copyright.h ============================================================================== --- user/ngie/stable-10-libnv/sys/sys/copyright.h Sun Jan 3 18:09:46 2016 (r293112) +++ user/ngie/stable-10-libnv/sys/sys/copyright.h Sun Jan 3 18:42:52 2016 (r293113) @@ -1,5 +1,5 @@ /*- - * Copyright (C) 1992-2015 The FreeBSD Project. All rights reserved. + * Copyright (C) 1992-2016 The FreeBSD Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,7 +30,7 @@ /* FreeBSD */ #define COPYRIGHT_FreeBSD \ - "Copyright (c) 1992-2015 The FreeBSD Project.\n" + "Copyright (c) 1992-2016 The FreeBSD Project.\n" /* Foundation */ #define TRADEMARK_Foundation \ Modified: user/ngie/stable-10-libnv/usr.sbin/makefs/makefs.c ============================================================================== --- user/ngie/stable-10-libnv/usr.sbin/makefs/makefs.c Sun Jan 3 18:09:46 2016 (r293112) +++ user/ngie/stable-10-libnv/usr.sbin/makefs/makefs.c Sun Jan 3 18:42:52 2016 (r293113) @@ -113,7 +113,7 @@ main(int argc, char *argv[]) start_time.tv_sec = start.tv_sec; start_time.tv_nsec = start.tv_usec * 1000; - while ((ch = getopt(argc, argv, "B:b:Dd:f:F:M:m:N:o:pr:s:S:t:xZ")) != -1) { + while ((ch = getopt(argc, argv, "B:b:Dd:f:F:M:m:N:o:pR:s:S:t:xZ")) != -1) { switch (ch) { case 'B':
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601031842.u03IgqJ2003207>