diff options
| author | Russ Allbery <eagle@eyrie.org> | 2014-07-16 13:46:50 -0700 |
|---|---|---|
| committer | Russ Allbery <eagle@eyrie.org> | 2014-07-16 13:46:50 -0700 |
| commit | 1796d631f0846ec98cd286bc4284898a7300ee78 (patch) | |
| tree | 6fd42de6dc858ef06c6d270410c32ec61f39e593 /util/messages-krb5.c | |
| parent | f5194217566a6f4cdeffbae551153feb1412210d (diff) | |
| parent | 6409733ee3b7b1910dc1c166a392cc628834146c (diff) | |
Merge tag 'upstream/1.1' into debian
Upstream version 1.1
Conflicts:
NEWS
README
client/keytab.c
perl/lib/Wallet/ACL.pm
perl/sql/Wallet-Schema-0.08-PostgreSQL.sql
perl/t/general/admin.t
perl/t/verifier/ldap-attr.t
Change-Id: I1a1dc09b97c9258e61f1c8877d0837193c8ae2c6
Diffstat (limited to 'util/messages-krb5.c')
| -rw-r--r-- | util/messages-krb5.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/util/messages-krb5.c b/util/messages-krb5.c index 23fd56a..961ea1d 100644 --- a/util/messages-krb5.c +++ b/util/messages-krb5.c @@ -8,8 +8,8 @@ * The canonical version of this file is maintained in the rra-c-util package, * which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>. * - * Written by Russ Allbery <rra@stanford.edu> - * Copyright 2006, 2007, 2008, 2009, 2010 + * Written by Russ Allbery <eagle@eyrie.org> + * Copyright 2006, 2007, 2008, 2009, 2010, 2013 * The Board of Trustees of the Leland Stanford Junior University * * Permission is hereby granted, free of charge, to any person obtaining a @@ -35,7 +35,6 @@ #include <portable/krb5.h> #include <portable/system.h> -#include <util/macros.h> #include <util/messages.h> #include <util/messages-krb5.h> #include <util/xmalloc.h> |