From bd3f70bb40f67fb6fd96f67047130778f587a5c9 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Mon, 14 Jun 2010 11:50:06 -0400 Subject: [PATCH] Update copyright year --HG-- branch : 1.7 --- HISTORY | 3 +++ LICENSE | 4 ++-- aix.c | 2 +- alias.c | 2 +- alloc.h | 2 +- boottime.c | 2 +- bsm_audit.h | 1 + compat.h | 2 +- defaults.c | 2 +- defaults.h | 2 +- env.c | 2 +- fileops.c | 3 ++- find_path.c | 3 ++- gettime.c | 3 ++- gram.y | 2 +- history.pod | 3 +++ lbuf.h | 2 +- license.pod | 35 ++++++++++++++++++++++++++++++++--- logging.c | 2 +- match.c | 2 +- missing.h | 2 +- nanosleep.c | 2 +- parse.h | 2 +- set_perms.c | 2 +- sudoers.ldap.cat | 24 ++++++++++++------------ sudoers.ldap.man.in | 4 ++-- sudoers.ldap.pod | 2 +- sudoreplay.c | 2 +- term.c | 2 +- tgetpass.c | 2 +- toke.l | 2 +- visudo.c | 2 +- visudo.cat | 6 +++--- visudo.man.in | 4 ++-- visudo.pod | 2 +- 35 files changed, 89 insertions(+), 50 deletions(-) diff --git a/HISTORY b/HISTORY index f9a12b2c3..e237ad3df 100644 --- a/HISTORY +++ b/HISTORY @@ -41,6 +41,9 @@ had been added in the past ten years. This new parser removes some limitations of the previous one, removes ordering constraints and adds support for including multiple sudoers files. +In 2010, Quest Software began sponsoring Sudo development by hiring Todd to +work on Sudo as part of his full-time job. + sudo, in its current form, is maintained by: Todd Miller diff --git a/LICENSE b/LICENSE index 0632e0bf1..6e9a547ab 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ Sudo is distributed under the following ISC-style license: - Copyright (c) 1994-1996, 1998-2009 + Copyright (c) 1994-1996, 1998-2010 Todd C. Miller Permission to use, copy, modify, and distribute this software for any @@ -75,4 +75,4 @@ nonunix.h and vasgroups.c bear the following license: INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. + POSSIBILITY OF SUCH DAMAGE. diff --git a/aix.c b/aix.c index aa6156819..0d57c4354 100644 --- a/aix.c +++ b/aix.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008 Todd C. Miller + * Copyright (c) 2008, 2010 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/alias.c b/alias.c index 0478e5ab8..c44636ab7 100644 --- a/alias.c +++ b/alias.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005m, 2007-2009 + * Copyright (c) 2004-2005, 2007-2010 * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/alloc.h b/alloc.h index 7442fe8c1..d3e1b07de 100644 --- a/alloc.h +++ b/alloc.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Todd C. Miller + * Copyright (c) 2009-2010 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/boottime.c b/boottime.c index 1067e34de..be54a851a 100644 --- a/boottime.c +++ b/boottime.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Todd C. Miller + * Copyright (c) 2009-2010 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/bsm_audit.h b/bsm_audit.h index 6ccb79db2..37be345c4 100644 --- a/bsm_audit.h +++ b/bsm_audit.h @@ -1,4 +1,5 @@ /* + * Copyright (c) 2009 Todd C. Miller * Copyright (c) 2009 Christian S.J. Peron * * Permission to use, copy, modify, and distribute this software for any diff --git a/compat.h b/compat.h index a57785480..14e7c7dab 100644 --- a/compat.h +++ b/compat.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 1998-2005, 2008, 2010 + * Copyright (c) 1996, 1998-2005, 2008-2010 * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/defaults.c b/defaults.c index ce68f05da..247167795 100644 --- a/defaults.c +++ b/defaults.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2005, 2007-2008 + * Copyright (c) 1999-2005, 2007-2008, 2010 * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/defaults.h b/defaults.h index 516f496a6..eb2188a14 100644 --- a/defaults.h +++ b/defaults.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2005, 2008 + * Copyright (c) 1999-2005, 2008, 2010 * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/env.c b/env.c index 14cbf44fd..6ad9bd2a6 100644 --- a/env.c +++ b/env.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2005, 2007-2009 + * Copyright (c) 2000-2005, 2007-2010 * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/fileops.c b/fileops.c index c2dc152fb..c7e0bc77f 100644 --- a/fileops.c +++ b/fileops.c @@ -1,5 +1,6 @@ /* - * Copyright (c) 1999-2005,2007,2009 Todd C. Miller + * Copyright (c) 1999-2005, 2007, 2009, 2010 + * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/find_path.c b/find_path.c index 4a732581b..2f2333963 100644 --- a/find_path.c +++ b/find_path.c @@ -1,5 +1,6 @@ /* - * Copyright (c) 1996, 1998-2005 Todd C. Miller + * Copyright (c) 1996, 1998-2005, 2010 + * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/gettime.c b/gettime.c index 1f498dbc4..9a13003c4 100644 --- a/gettime.c +++ b/gettime.c @@ -1,5 +1,6 @@ /* - * Copyright (c) 2004-2005, 2008 Todd C. Miller + * Copyright (c) 2004-2005, 2008, 2010 + * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/gram.y b/gram.y index 1c669aab5..6a48f2ddc 100644 --- a/gram.y +++ b/gram.y @@ -1,6 +1,6 @@ %{ /* - * Copyright (c) 1996, 1998-2005, 2007-2009 + * Copyright (c) 1996, 1998-2005, 2007-2010 * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/history.pod b/history.pod index 21509470c..7fb490cc7 100644 --- a/history.pod +++ b/history.pod @@ -47,6 +47,9 @@ features that had been added in the past ten years. This new parser removes some limitations of the previous one, removes ordering constraints and adds support for including multiple sudoers files. +In 2010, Quest Software began sponsoring Sudo development by hiring +Todd to work on Sudo as part of his full-time job. + sudo, in its current form, is maintained by: Todd Miller diff --git a/lbuf.h b/lbuf.h index 9c3d4adc4..db6f96451 100644 --- a/lbuf.h +++ b/lbuf.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007 Todd C. Miller + * Copyright (c) 2007, 2010 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/license.pod b/license.pod index bd738b086..a5fdb7bdc 100644 --- a/license.pod +++ b/license.pod @@ -3,7 +3,7 @@ =head3 Sudo is distributed under the following ISC-style license: - Copyright (c) 1994-1996, 1998-2008 + Copyright (c) 1994-1996, 1998-2010 Todd C. Miller Permission to use, copy, modify, and distribute this software for any @@ -23,8 +23,8 @@ Sudo is distributed under the following ISC-style license: Materiel Command, USAF, under agreement number F39502-99-1-0512. =head3 -Additionally, fnmatch.c, fnmatch.h, getcwd.c, glob.c, glob.h, mkstemp.c -and snprintf.c bear the following UCB license: +Additionally, fnmatch.c, fnmatch.h, getcwd.c, glob.c, glob.h and snprintf.c +bear the following UCB license: Copyright (c) 1987, 1989, 1990, 1991, 1992, 1993, 1994 The Regents of the University of California. All rights reserved. @@ -52,3 +52,32 @@ and snprintf.c bear the following UCB license: LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +=head3 +nonunix.h and vasgroups.c bear the following license: + + Copyright (c) 2006 Quest Software, 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: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + 2. 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. + 3. Neither the name of Quest Software, 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 + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. diff --git a/logging.c b/logging.c index 00759d385..c772a1def 100644 --- a/logging.c +++ b/logging.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994-1996, 1998-2009 Todd C. Miller + * Copyright (c) 1994-1996, 1998-2010 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/match.c b/match.c index fa8441b4a..7ba89a853 100644 --- a/match.c +++ b/match.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 1998-2005, 2007-2009 + * Copyright (c) 1996, 1998-2005, 2007-2010 * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/missing.h b/missing.h index b945eca01..911ad13b8 100644 --- a/missing.h +++ b/missing.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Todd C. Miller + * Copyright (c) 2009-2010 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/nanosleep.c b/nanosleep.c index 932f342ea..ae2208b95 100644 --- a/nanosleep.c +++ b/nanosleep.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Todd C. Miller + * Copyright (c) 2009-2010 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/parse.h b/parse.h index 9d881f463..90595bfc3 100644 --- a/parse.h +++ b/parse.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 1998-2000, 2004, 2007-2009 + * Copyright (c) 1996, 1998-2000, 2004, 2007-2010 * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/set_perms.c b/set_perms.c index 535573021..b867af5b0 100644 --- a/set_perms.c +++ b/set_perms.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994-1996,1998-2009 Todd C. Miller + * Copyright (c) 1994-1996,1998-2010 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/sudoers.ldap.cat b/sudoers.ldap.cat index 1b5b1e271..45f7ceb88 100644 --- a/sudoers.ldap.cat +++ b/sudoers.ldap.cat @@ -61,7 +61,7 @@ DDEESSCCRRIIPPTTIIOONN -1.7.3b2 December 19, 2009 1 +1.7.3b3 June 14, 2010 1 @@ -127,7 +127,7 @@ SUDOERS.LDAP(4) MAINTENANCE COMMANDS SUDOERS.LDAP(4) -1.7.3b2 December 19, 2009 2 +1.7.3b3 June 14, 2010 2 @@ -193,7 +193,7 @@ SUDOERS.LDAP(4) MAINTENANCE COMMANDS SUDOERS.LDAP(4) -1.7.3b2 December 19, 2009 3 +1.7.3b3 June 14, 2010 3 @@ -259,7 +259,7 @@ SUDOERS.LDAP(4) MAINTENANCE COMMANDS SUDOERS.LDAP(4) -1.7.3b2 December 19, 2009 4 +1.7.3b3 June 14, 2010 4 @@ -325,7 +325,7 @@ SUDOERS.LDAP(4) MAINTENANCE COMMANDS SUDOERS.LDAP(4) -1.7.3b2 December 19, 2009 5 +1.7.3b3 June 14, 2010 5 @@ -391,7 +391,7 @@ SUDOERS.LDAP(4) MAINTENANCE COMMANDS SUDOERS.LDAP(4) -1.7.3b2 December 19, 2009 6 +1.7.3b3 June 14, 2010 6 @@ -457,7 +457,7 @@ SUDOERS.LDAP(4) MAINTENANCE COMMANDS SUDOERS.LDAP(4) -1.7.3b2 December 19, 2009 7 +1.7.3b3 June 14, 2010 7 @@ -523,7 +523,7 @@ SUDOERS.LDAP(4) MAINTENANCE COMMANDS SUDOERS.LDAP(4) -1.7.3b2 December 19, 2009 8 +1.7.3b3 June 14, 2010 8 @@ -589,7 +589,7 @@ EEXXAAMMPPLLEESS -1.7.3b2 December 19, 2009 9 +1.7.3b3 June 14, 2010 9 @@ -655,7 +655,7 @@ SUDOERS.LDAP(4) MAINTENANCE COMMANDS SUDOERS.LDAP(4) -1.7.3b2 December 19, 2009 10 +1.7.3b3 June 14, 2010 10 @@ -721,7 +721,7 @@ SUDOERS.LDAP(4) MAINTENANCE COMMANDS SUDOERS.LDAP(4) -1.7.3b2 December 19, 2009 11 +1.7.3b3 June 14, 2010 11 @@ -787,6 +787,6 @@ DDIISSCCLLAAIIMMEERR -1.7.3b2 December 19, 2009 12 +1.7.3b3 June 14, 2010 12 diff --git a/sudoers.ldap.man.in b/sudoers.ldap.man.in index 9096900c3..3c7eb9a85 100644 --- a/sudoers.ldap.man.in +++ b/sudoers.ldap.man.in @@ -1,4 +1,4 @@ -.\" Copyright (c) 2003-2009 +.\" Copyright (c) 2003-2010 .\" Todd C. Miller .\" .\" Permission to use, copy, modify, and distribute this software for any @@ -140,7 +140,7 @@ .\" ======================================================================== .\" .IX Title "SUDOERS.LDAP @mansectform@" -.TH SUDOERS.LDAP @mansectform@ "December 19, 2009" "1.7.3b2" "MAINTENANCE COMMANDS" +.TH SUDOERS.LDAP @mansectform@ "June 14, 2010" "1.7.3b3" "MAINTENANCE COMMANDS" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/sudoers.ldap.pod b/sudoers.ldap.pod index 5a079c178..4b4533106 100644 --- a/sudoers.ldap.pod +++ b/sudoers.ldap.pod @@ -1,4 +1,4 @@ -Copyright (c) 2003-2009 +Copyright (c) 2003-2010 Todd C. Miller Permission to use, copy, modify, and distribute this software for any diff --git a/sudoreplay.c b/sudoreplay.c index 61b2cecaf..bd2ba44e9 100644 --- a/sudoreplay.c +++ b/sudoreplay.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Todd C. Miller + * Copyright (c) 2009-2010 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/term.c b/term.c index a21a4b655..895ef37e4 100644 --- a/term.c +++ b/term.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Todd C. Miller + * Copyright (c) 2009-2010 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/tgetpass.c b/tgetpass.c index 6c774624d..f0d2a36d3 100644 --- a/tgetpass.c +++ b/tgetpass.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 1998-2005, 2007-2009 + * Copyright (c) 1996, 1998-2005, 2007-2010 * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/toke.l b/toke.l index bbb333bbd..c871a1100 100644 --- a/toke.l +++ b/toke.l @@ -1,6 +1,6 @@ %{ /* - * Copyright (c) 1996, 1998-2005, 2007-2009 + * Copyright (c) 1996, 1998-2005, 2007-2010 * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/visudo.c b/visudo.c index 6fd333854..606a054ca 100644 --- a/visudo.c +++ b/visudo.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 1998-2005, 2007-2009 + * Copyright (c) 1996, 1998-2005, 2007-2010 * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/visudo.cat b/visudo.cat index 74deba8c6..ba0ee8337 100644 --- a/visudo.cat +++ b/visudo.cat @@ -61,7 +61,7 @@ OOPPTTIIOONNSS -1.7.3b2 December 19, 2009 1 +1.7.3b3 June 14, 2010 1 @@ -127,7 +127,7 @@ AAUUTTHHOORR -1.7.3b2 December 19, 2009 2 +1.7.3b3 June 14, 2010 2 @@ -193,6 +193,6 @@ DDIISSCCLLAAIIMMEERR -1.7.3b2 December 19, 2009 3 +1.7.3b3 June 14, 2010 3 diff --git a/visudo.man.in b/visudo.man.in index c5e92779b..51bb1f148 100644 --- a/visudo.man.in +++ b/visudo.man.in @@ -1,4 +1,4 @@ -.\" Copyright (c) 1996,1998-2005, 2007-2008 +.\" Copyright (c) 1996,1998-2005, 2007-2010 .\" Todd C. Miller .\" .\" Permission to use, copy, modify, and distribute this software for any @@ -144,7 +144,7 @@ .\" ======================================================================== .\" .IX Title "VISUDO @mansectsu@" -.TH VISUDO @mansectsu@ "December 19, 2009" "1.7.3b2" "MAINTENANCE COMMANDS" +.TH VISUDO @mansectsu@ "June 14, 2010" "1.7.3b3" "MAINTENANCE COMMANDS" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/visudo.pod b/visudo.pod index 474b72d3d..b68723c86 100644 --- a/visudo.pod +++ b/visudo.pod @@ -1,4 +1,4 @@ -Copyright (c) 1996,1998-2005, 2007-2008 +Copyright (c) 1996,1998-2005, 2007-2010 Todd C. Miller Permission to use, copy, modify, and distribute this software for any -- 2.40.0