volscan: fix copyright and licence notice

These are new files and new content; fix the copyright notice and
license to reflect.

Reviewed-on: http://gerrit.openafs.org/11362
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: Jeffrey Altman <jaltman@your-file-system.com>
(cherry picked from commit 1283226ccb638be47ead6cc4d9a47381aa6b08d1)

Change-Id: I4026bba6a10459ca0eb7b63666fe8e278949ca78
Reviewed-on: http://gerrit.openafs.org/11388
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>

diff --git a/doc/man-pages/pod8/volscan.pod b/doc/man-pages/pod8/volscan.pod
index 496e405fdcc0cc0183dc5a6898e8ebacda36d6dd..4e6144630faae621910fef69377560203ca787d3 100644 (file)
--- a/doc/man-pages/pod8/volscan.pod
+++ b/doc/man-pages/pod8/volscan.pod
@@ -342,7 +342,8 @@ L<volserver(8)>
 
 =head1 COPYRIGHT
 
-IBM Corporation 2000. <http://www.ibm.com/> All Rights Reserved.
-Sine Nomine Associates 2014.  All Rights Reserved.
+Copyright 2014 Sine Nomine Associates.  All Rights Reserved.
 
-This documentation is covered by the IBM Public License Version 1.0.
+This documentation is covered by the BSD License as written in the
+doc/LICENSE file. This man page was written by Michael Meffie for
+OpenAFS.

diff --git a/src/vol/volscan-main.c b/src/vol/volscan-main.c
index dfd2c6fe1b855faeddf0d38ae1d21a1c85517951..9a24f56bd2ef985283c0533b22961630192c55ea 100644 (file)
--- a/src/vol/volscan-main.c
+++ b/src/vol/volscan-main.c
@@ -1,10 +1,29 @@
 /*
- * Copyright 2000, International Business Machines Corporation and others.
+ * Copyright 2013-2014, Sine Nomine Associates
  * All Rights Reserved.
  *
- * This software has been released under the terms of the IBM Public
- * License.  For details, see the LICENSE file in the top-level source
- * directory or online at http://www.openafs.org/dl/license10.html
+ * 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.
+ *
+ * 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 HOLDERS 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.
  */
 
 #include <afsconfig.h>