diff options
author | a1346054 <36859588+a1346054@users.noreply.github.com> | 2021-08-19 15:48:01 +0000 |
---|---|---|
committer | a1346054 <36859588+a1346054@users.noreply.github.com> | 2021-08-19 15:48:01 +0000 |
commit | 93c8e7b2f170606b60e6d105e6fd9b22e444726b (patch) | |
tree | a4d7f7d585fa4f44c6324f1d0e955c9d85a1000d | |
parent | 2d0d7f5963b10974f4a9bbee6a43ffdab33e8649 (diff) | |
download | sudo-93c8e7b2f170606b60e6d105e6fd9b22e444726b.tar.gz |
Minor cleanup (#110)
* fix trivial shell script issues
* remove trailing whitespace
-rw-r--r-- | .clang-format | 2 | ||||
-rw-r--r-- | INSTALL | 2 | ||||
-rw-r--r-- | MANIFEST | 2 | ||||
-rwxr-xr-x | autogen.sh | 4 | ||||
-rw-r--r-- | doc/LICENSE | 56 | ||||
-rw-r--r-- | etc/sudo.pp | 2 | ||||
-rw-r--r-- | examples/Makefile.in | 2 |
7 files changed, 35 insertions, 35 deletions
diff --git a/.clang-format b/.clang-format index cdb6710e1..4e850b8ba 100644 --- a/.clang-format +++ b/.clang-format @@ -8,7 +8,7 @@ BreakBeforeBinaryOperators: None ColumnLimit: 80 IndentWidth: 4 ContinuationIndentWidth: 8 -ForEachMacros: +ForEachMacros: - HLTQ_FOREACH - HLTQ_FOREACH_REVERSE - HLTQ_FOREACH_REVERSE_SAFE @@ -406,7 +406,7 @@ Optional features: is to compile noexec support if libtool supports building shared objects on your system. - --with-selinux + --with-selinux Enable support for role based access control (RBAC) on systems that support SELinux. @@ -157,7 +157,7 @@ lib/iolog/regress/fuzz/fuzz_iolog_json.c lib/iolog/regress/fuzz/fuzz_iolog_json.dict lib/iolog/regress/fuzz/fuzz_iolog_legacy.c lib/iolog/regress/fuzz/fuzz_iolog_timing.c -lib/iolog/regress/host_port/host_port_test.c +lib/iolog/regress/host_port/host_port_test.c lib/iolog/regress/iolog_json/check_iolog_json.c lib/iolog/regress/iolog_json/test1.in lib/iolog/regress/iolog_json/test2.in diff --git a/autogen.sh b/autogen.sh index 0037c6005..d844cd935 100755 --- a/autogen.sh +++ b/autogen.sh @@ -4,10 +4,10 @@ # If the user hasn't chosen one themselves, we do here. if [ "`/usr/bin/uname 2>&1`" = "OpenBSD" ]; then if [ X"$AUTOMAKE_VERSION" = X"" ]; then - AUTOMAKE_VERSION=1.16; export AUTOMAKE_VERSION + AUTOMAKE_VERSION=1.16; export AUTOMAKE_VERSION fi if [ X"$AUTOCONF_VERSION" = X"" ]; then - AUTOCONF_VERSION=2.69; export AUTOCONF_VERSION + AUTOCONF_VERSION=2.69; export AUTOCONF_VERSION fi fi diff --git a/doc/LICENSE b/doc/LICENSE index 60f193f38..85e9a3d1f 100644 --- a/doc/LICENSE +++ b/doc/LICENSE @@ -20,13 +20,13 @@ Sudo is distributed under the following license: Materiel Command, USAF, under agreement number F39502-99-1-0512. The Python plugin bindings bear the following license: - + Copyright (c) 2019-2020 Robert Manner <robert.manner@oneidentity.com> - + Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. - + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR @@ -42,7 +42,7 @@ The files hostcheck.c and hostcheck.h bear the following license: Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. - + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR @@ -54,13 +54,13 @@ The files hostcheck.c and hostcheck.h bear the following license: The file redblack.c bears the following license: Copyright (c) 2001 Emin Martinian - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that neither the name of Emin Martinian nor the names of any contributors are be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -76,13 +76,13 @@ The file redblack.c bears the following license: The file sssd.c bears the following license: Copyright (c) 2011 Daniel Kopecek <dkopecek@redhat.com> - + This code is derived from software contributed by Aaron Spangler. - + Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. - + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR @@ -94,11 +94,11 @@ The file sssd.c bears the following license: The files bsm_audit.c and bsm_audit.h bear the following license: Copyright (c) 2009 Christian S.J. Peron - + Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. - + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR @@ -110,11 +110,11 @@ The files bsm_audit.c and bsm_audit.h bear the following license: The files solaris_audit.c and solaris_audit.h bear the following license: Copyright (c) 2014, Oracle and/or its affiliates. - + Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. - + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR @@ -126,11 +126,11 @@ The files solaris_audit.c and solaris_audit.h bear the following license: The file reallocarray.c bears the following license: Copyright (c) 2008 Otto Moerbeek <otto@drijf.net> - + Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. - + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR @@ -173,7 +173,7 @@ The file fnmatch.c bears the following license: Copyright (c) 2011, VMware, Inc. All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright @@ -184,7 +184,7 @@ The file fnmatch.c bears the following license: * Neither the name of the VMware, Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -248,11 +248,11 @@ The file arc4random.c bears the following license: Copyright (c) 2008, Damien Miller <djm@openbsd.org> Copyright (c) 2013, Markus Friedl <markus@openbsd.org> Copyright (c) 2014, Theo de Raadt <deraadt@openbsd.org> - + Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. - + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR @@ -260,15 +260,15 @@ The file arc4random.c bears the following license: WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - + The file arc4random_uniform.c bears the following license: Copyright (c) 2008, Damien Miller <djm@openbsd.org> - + Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. - + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR @@ -281,11 +281,11 @@ The file getentropy.c bears the following license: Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> Copyright (c) 2014 Bob Beck <beck@obtuse.com> - + Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. - + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR @@ -321,19 +321,19 @@ The embedded copy of protobuf-c bears the following license: Copyright (c) 2008-2018, Dave Benson and the protobuf-c authors. All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR diff --git a/etc/sudo.pp b/etc/sudo.pp index 1697f4e79..7008a5456 100644 --- a/etc/sudo.pp +++ b/etc/sudo.pp @@ -512,7 +512,7 @@ still allow people to get their work done." print "On Debian we normally use gid 27 for \"sudo\".\n"; $gname = getgrgid(27); print "However, on your system gid 27 is group \"$gname\".\n\n"; - print "Would you like me to stop configuring sudo so that you can change this? [n] "; + print "Would you like me to stop configuring sudo so that you can change this? [n] "; $ans = <STDIN>; if ($ans =~ /^[yY]/) { print "\"dpkg --pending --configure\" will restart the configuration.\n\n"; diff --git a/examples/Makefile.in b/examples/Makefile.in index 245705a68..453b1302e 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -56,7 +56,7 @@ LOGSRVD_CONF = @LOGSRVD_CONF@ EXAMPLES = $(srcdir)/pam.conf sudo.conf $(LOGSRVD_CONF) \ $(srcdir)/sudoers $(srcdir)/syslog.conf - + VERSION = @PACKAGE_VERSION@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ |