diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2020-10-31 14:55:10 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2020-10-31 14:55:10 +0000 |
commit | 5e6464f9c6756c95d036c4acf7ce557a7eb3a7be (patch) | |
tree | 4fbab44b5460985f34af92e149451bf08d569ac1 /include | |
parent | 69d7eab0b8bb14f8d52539618ae33918032eaaf7 (diff) | |
parent | dfc00eb7dea43bfb6d4a2ba38c4f6bc9745f3729 (diff) | |
download | qemu-5e6464f9c6756c95d036c4acf7ce557a7eb3a7be.zip qemu-5e6464f9c6756c95d036c4acf7ce557a7eb3a7be.tar.gz qemu-5e6464f9c6756c95d036c4acf7ce557a7eb3a7be.tar.bz2 |
Merge remote-tracking branch 'remotes/berrange-gitlab/tags/misc-next-pull-request' into staging
Misc fixes
* Improve socket cnnection failure error reporting
* Fix LGPL version number
# gpg: Signature made Thu 29 Oct 2020 10:00:47 GMT
# gpg: using RSA key DAF3A6FDB26B62912D0E8E3FBE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>" [full]
# gpg: aka "Daniel P. Berrange <berrange@redhat.com>" [full]
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF
* remotes/berrange-gitlab/tags/misc-next-pull-request:
util: include the target address in socket connect failures
io: Don't use '#' flag of printf format
authz: Fix Lesser GPL version number
crypt: Fix Lesser GPL version number
io: Fix Lesser GPL version number
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/authz/base.h | 2 | ||||
-rw-r--r-- | include/authz/list.h | 2 | ||||
-rw-r--r-- | include/authz/listfile.h | 2 | ||||
-rw-r--r-- | include/authz/pamacct.h | 2 | ||||
-rw-r--r-- | include/authz/simple.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/include/authz/base.h b/include/authz/base.h index eca170e..b53e4e4 100644 --- a/include/authz/base.h +++ b/include/authz/base.h @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/include/authz/list.h b/include/authz/list.h index f73bc5c..7ef4ad4 100644 --- a/include/authz/list.h +++ b/include/authz/list.h @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/include/authz/listfile.h b/include/authz/listfile.h index 51824f3..0a1e5bd 100644 --- a/include/authz/listfile.h +++ b/include/authz/listfile.h @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/include/authz/pamacct.h b/include/authz/pamacct.h index d05c18a..592edb2 100644 --- a/include/authz/pamacct.h +++ b/include/authz/pamacct.h @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/include/authz/simple.h b/include/authz/simple.h index 9f5b979..c46a5ac 100644 --- a/include/authz/simple.h +++ b/include/authz/simple.h @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of |