summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-04-19If apropos(1) finds no match, print "nothing appropriate" to stderrIngo Schwarze
similar to what the old apropos did. Requested by and OK deraadt@.
2015-04-19Unify trickier node handling functions.Ingo Schwarze
* man_elem_alloc() -> roff_elem_alloc() * man_block_alloc() -> roff_block_alloc() The functions mdoc_elem_alloc() and mdoc_block_alloc() remain for now because they need to do mdoc(7)-specific argument processing.
2015-04-19Bump minor, regen .pc and headerJames Turner
2015-04-19Merge conflictsJames Turner
2015-04-19Unify some node handling functions that use TOKEN_NONE.Ingo Schwarze
* mdoc_word_alloc(), man_word_alloc() -> roff_word_alloc() * mdoc_word_append(), man_word_append() -> roff_word_append() * mdoc_addspan(), man_addspan() -> roff_addtbl() * mdoc_addeqn(), man_addeqn() -> roff_addeqn() Minus 50 lines of code, no functional change.
2015-04-19Merge conflictsJames Turner
2015-04-19Update sqlite3 to 3.8.9. Changes available here:James Turner
http://sqlite.org/releaselog/3_8_9.html Tested in bulk and ok landry@
2015-04-19Decouple the token code for "no request or macro" from the individualIngo Schwarze
high-level parsers to allow further unification of functions that only need to recognize this code, but that don't care about different high-level macrosets beyond that.
2015-04-19Unify node handling functions:Ingo Schwarze
* node_alloc() for mdoc and man_node_alloc() -> roff_node_alloc() * node_append() for mdoc and man_node_append() -> roff_node_append() * mdoc_head_alloc() and man_head_alloc() -> roff_head_alloc() * mdoc_body_alloc() and man_body_alloc() -> roff_body_alloc() * mdoc_node_unlink() and man_node_unlink() -> roff_node_unlink() * mdoc_node_free() and man_node_free() -> roff_node_free() * mdoc_node_delete() and man_node_delete() -> roff_node_delete() Minus 130 lines of code, no functional change.
2015-04-19by default fill the ping payload with a chacha stream instead ofDavid Gwynne
an unvarying payload. each ping process generates a random key, and each packet then uses the timestamps mac as the IV for the stream. this allows us to have a different payload per packet that we can recalculate and compare in the same was as the static payload was checked before. by aggressively varying the payload we hope to generate more opportunities for dodgy network equipment to show errors. note that we do siphash before chacha because we want to be strict about the timestamp payload, but we want to be able to recognise errors in the rest of the payload and where those errors were. doing chacha before siphash would have us than fail the whole packet if a checksum doesnt match. discussed with jp aumasson ok florian@
2015-04-19add a mac to the timestamp payload and calculate it with siphash.David Gwynne
this lets us have some confidence that the timestamp hasnt been damaged or tampered with in transit. discussed with jp aumasson ok florian@
2015-04-19Do not truncate possible remaining transfer length.Martin Pieuchot
Reported by Takahiro HAYASHI on bugs@, thanks!
2015-04-19Remove reference to oss audio emulation,Alexandre Ratchov
from Scarlett <scarlett at entering.space>. Thanks!
2015-04-19Make SNDCLT_DSP_* ioctls return ENOTTY, and remove the correspondingAlexandre Ratchov
code. No ABI change. ok armani@, guenther@, sthen@
2015-04-19Remove emulation of oss audio ioctls from linux emulation.Alexandre Ratchov
ok armani, guenther, sthen
2015-04-19Add a missing pmap_kremoveStefan Fritsch
Noticed by mlarkin@
2015-04-19Binary code patching on i386Stefan Fritsch
This commit ports the infrastructure to do binary code patching from amd64. The existing code patching for SMAP is converted to the new infrastruture. ok kettenis@ "should go in" deraadt@
2015-04-19Enable the REG_READ ioctl. A whitelist is used to allowJonathan Gray
reading a timestamp off the render ring for the Mesa i965 driver. ok kettenis@
2015-04-19Don't lock the file for "vi -R" or "view". OK deraadt@Todd C. Miller
2015-04-19Force the boot partition to ext2fs, rathern than leaving it as it was.Theo de Raadt
Found by inspection while curious... not though actual experience... ok miod
2015-04-18It seems that the CPUID lies about the monitor-line size, or at least ourMark Kettenis
interpretation of it isn't quite right. So instead of allocating memory and slicing it based on the parameters returned by CPUID, simply use a member in struct cpu_info like basically all other OSes out there do. Our struct cpu_info is large enough to never cause any overlap. This makes the mwait-based idle loop actually work. We still execute the CPUID instruction to make sure monitor/mwait is properly supported by the hardware we're running on. ok sthen@, deraadt@, guenther@
2015-04-18Convert many atoi() calls to strtonum(), adding range checks and failureTheo de Raadt
handling along the way. Reviews by Brendan MacDonell, Jeremy Devenport, florian, doug, millert
2015-04-18Delete the wrapper functions mdoc_meta(), man_meta(), mdoc_node(),Ingo Schwarze
man_node() from the mandoc(3) semi-public interface and the internal wrapper functions print_mdoc() and print_man() from the HTML formatters. Minus 60 lines of code, no functional change.
2015-04-18Unify {mdoc,man}_{alloc,reset,free}() into roff_man_{alloc,reset,free}().Ingo Schwarze
Minus 80 lines of code, no functional change. Written on the train from Koeln to Wolfsburg returning from p2k15.
2015-04-18Move mdoc_hash_init() and man_hash_init() to libmandoc.hIngo Schwarze
and call them from mparse_alloc() and choose_parser(), preparing unified allocation of struct roff_man.
2015-04-18Profit from the unified struct roff_man and reduce the number ofIngo Schwarze
arguments of mparse_result() by one. No functional change. Written on the ICE Bruxelles-Koeln on the way back from p2k15.
2015-04-18Replace the structs mdoc and man by a unified struct roff_man.Ingo Schwarze
Almost completely mechanical, no functional change. Written on the train from Exeter to London returning from p2k15.
2015-04-18another round of reducing the diff to linuxJonathan Gray
2015-04-18Simplify vio_encap() a bit.Stefan Fritsch
From brad@
2015-04-18from brad:Jason McIntyre
don;t try to list all generations in ciss's Nd; do not use all caps for "array"
2015-04-18define and use trace macrosJonathan Gray
discussed with kettenis
2015-04-18Remove some unused debug functions. If we're interested inJonathan Gray
these in future we should add i915_debugfs.c
2015-04-18replace the hand rolled lists of mbufs in hfsc_classq with anDavid Gwynne
mbuf_list. hfsc lists are very clever because they manage a fifo with a single pointer by abusing the m_next pointer of the tail mbuf to point to the head. clever but hard to read. mbuf_lists are slightly bigger because they explicitely track the head mbuf, but i got us that space back by inlining hfsc_classq into hfsc_class and removing the unnecessary classq field. ok henning@
2015-04-18add and use module param macrosJonathan Gray
2015-04-18Avoid calling freeifaddrs() with an uninitialised pointer in anJonathan Gray
error path.
2015-04-18Regis Leroy reported that httpd does not strictly accept CRLF forJonathan Gray
newlines which could lead to http response splitting/smuggling if a badly behaved proxy is in front of httpd. Switch from evbuffer_readline() to evbuffer_readln() with EVBUFFER_EOL_CRLF_STRICT to avoid this. ok florian@
2015-04-18i386 and amd64 have only one syscall entry point now, so simply thePhilip Guenther
EIP/RIP adjustment for ERESTART ok mlarkin@
2015-04-18Use futimens() to preserve timestamps with subsec precision.Philip Guenther
Don't cast file sizes to size_t when comparing file contents for the -C option ok deraadt@
2015-04-17Use getint() instead of intval() for parsing the columns variable,Theo de Raadt
allowing the addition of more accurate bounds and garbage checks. ok millert
2015-04-17FALLTHROUGH in getopt is incorrect. While here use strtonumTheo de Raadt
to parse tz_minuteswest. ok millert
2015-04-17On Ethernet packets have a minimal length, so very short packetsAlexander Bluhm
get padding appended to them. This padding is not stripped off in ip6_input() (due to support for IPv6 Jumbograms, RFC2675). That means PF needs to be careful when reassembling fragmented packets to not include the padding in the reassembled packet. from FreeBSD; via Kristof Provost; OK henning@
2015-04-17s/recommended/required/ that private keys be og-rDamien Miller
this wording change was made a while ago but got accidentally reverted
2015-04-17don't try to cleanup NULL KEX proposals in kex_prop_free();Damien Miller
found by Jukka Taimisto and Markus Hietava
2015-04-17use error/logit/fatal instead of fprintf(stderr, ...) and exit(0),Damien Miller
fix a few errors that were being printed to stdout instead of stderr and a few non-errors that were going to stderr instead of stdout bz#2325; ok dtucker
2015-04-17debug log missing DISPLAY environment when X11 forwardingDamien Miller
requested; bz#1682 ok dtucker@
2015-04-17while trying to reproduce lockups on mp alpha i hit anDavid Gwynne
MUTEX_ASSERT_UNLOCKED, but it turns out alpha mutexes arent very friendly to diagnostics on smp systems. alpha mutexes contained an mtx_lock member. when 0 the mutex was unlocked, and when 1 it was locked. the MUTEX_ASSERT_UNLOCKED checked if mtx_lock was 1 to see if the current cpu owned the mutex, but in an mp system another cpu may have set mtx_lock to 1, which causes the assert to fire. this changes alpha mutexes so they record which cpu owns the lock rather than just if the lock is held or not. the diagnostics compare the owner to the current cpus curcpu() address so they can actually tell if the current cpu holds the lock instead of whether any cpu holds the lock. instead of using custom asm to implement a cas this uses atomic_cas_ptr, which on alpha uses gcc cas code. miod says he has far more confidence in the gcc cas than the code that was there before. while im here i also shuffled the code. on MULTIPROCESSOR systems instead of duplicating code between mtx_enter and mtx_enter_try, mtx_enter simply loops on mtx_enter_try until it succeeds. this also provides an alternative implementation of mutexes on !MULTIPROCESSOR systems that avoids interlocking opcodes. mutexes wont contend on UP boxes, theyre basically wrappers around spls. we can just do the splraise, stash the owner as a guard value for DIAGNOSTIC and return. similarly, mtx_enter_try on UP will never fail, so we can just call mtx_enter and return 1. ok miod@
2015-04-17IPSEC_IN_CRYPTO_DONE and OUT_CRYPTO_NEEDED are goneMike Belopuhov
2015-04-17Stubs and support code for NIC-enabled IPsec bite the dust.Mike Belopuhov
No objection from reyk@, OK markus, hshoexer
2015-04-17Remove unused ipsp_parse_headers that was supposed to parse packetsMike Belopuhov
returned by IPsec-enabled NICs; OK markus, hshoexer
2015-04-17Remove unsupported SADB_X_IDENTTYPE_CONNECTION; OK markus, hshoexerMike Belopuhov