Re: Fix print-pflog.c

[Guy Harris <guy () alum mit edu>]

On Mar 31, 2010, at 6:41 AM, Wesley Shields wrote:

> Looks like commit e8b523758959c1854689d71c7a4686c631e5501c broke
> tcpdump on FreeBSD (and probably any other system with PF). The attached
> patch fixes the build.

Checked into the main branch and, it appears, into the 4.1 branch - I did, in a branch tracking the 4.1 branch, a pull 
to get the change into the repository, a cherry-pick to get that change into the branch, and a push, but Git gave one 
of its usual WTF-style errors:

        $ git push
        Counting objects: 7, done.
        Delta compression using 2 threads.
        Compressing objects: 100% (4/4), done.
        Writing objects: 100% (4/4), 473 bytes, done.
        Total 4 (delta 3), reused 0 (delta 0)
        To git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdump
           c2ccd65..e4773d6  tcpdump_4.1 -> tcpdump_4.1
         ! [rejected]        master -> master (non-fast forward)
        error: failed to push some refs to 'git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdump'

I have no idea what it failed to push, but it appears to have pushed your change, I guess.  I used my usual technique 
for dealing with Git weirdness, namely tossing out my repository (the one tracking the branch, in this case), and 
recreating it with git clone/git checkout -b, and the change appears to be there.-
This is the tcpdump-workers list.
Visit https://cod.sandelman.ca/ to unsubscribe.