summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorTodd C. Miller <Todd.Miller@courtesan.com>1999-07-31 16:20:10 +0000
committerTodd C. Miller <Todd.Miller@courtesan.com>1999-07-31 16:20:10 +0000
commitf080e9bd0517b5dddbbeb492724bc1ba4c943128 (patch)
tree1f8a3bcc40eb6d5eaf228b65eabfcd7ad7110ced /LICENSE
parentcd0c029cfe8e429515df52dd07843f4151cf6af1 (diff)
downloadsudo-f080e9bd0517b5dddbbeb492724bc1ba4c943128.tar.gz
add 4th term to license similar to term 5 in the apache license
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE14
1 files changed, 11 insertions, 3 deletions
diff --git a/LICENSE b/LICENSE
index 83e8588af..af9be1d6b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,19 +1,27 @@
Sudo is distributed under the following BSD-style license:
/*
- * Copyright (c) 1994-1996,1998,-999 Todd C. Miller <Todd.Miller@courtesan.com>
+ * Copyright (c) 1994-1996,1998-1999 Todd C. Miller <Todd.Miller@courtesan.com>
* 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. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ * derived from this software without specific prior written permission
+ * from the author.
+ *
+ * 4. Products derived from this software may not be called "Sudo" nor
+ * may "Sudo" appear in their names without specific prior written
+ * permission from the author.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
@@ -28,7 +36,7 @@ Sudo is distributed under the following BSD-style license:
*/
Additionally, lsearch.c, fnmatch.c, getcwd.c, and fnmatch.3 bear
-the following BSD license:
+the following UCB license:
/*
* Copyright (c) 1989, 1991, 1993, 1994