Relicensed dump/restore under the revised BSD license, as per ftp://ftp.cs.berkeley...

[dump.git] / dump / optr.c

diff --git a/dump/optr.c b/dump/optr.c
index 628c9817ea2c1484350b2dd7c6b2f406841ad32d..8d72cab7ee83e26ed8b4802c5b6d2f51b6964a72 100644 (file)
--- a/dump/optr.c
+++ b/dump/optr.c
@@ -18,11 +18,7 @@
  * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -41,7 +37,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: optr.c,v 1.33 2002/12/12 11:49:35 stelian Exp $";
+       "$Id: optr.c,v 1.36 2003/03/30 15:40:36 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -487,7 +483,7 @@ getfstab(void)
        struct pfstab *pf;
        struct pfstab *pfold = NULL;
        FILE *mntfp;
-       char *mnttables[] = { _PATH_MNTTAB, _PATH_MOUNTED, 0 };
+       char *mnttables[] = { _PATH_MOUNTED, _PATH_MNTTAB, 0 };
        int i;
 
        for (i = 0; mnttables[i]; i++) {
@@ -637,7 +633,7 @@ lastdump(char arg) /* w ==> just what to do; W ==> most recent dumps */
        initdumptimes(0);       /* dumpdates input */
        if (ddatev == NULL && table == NULL) {
                (void) printf("No %s or %s file found\n",
-                             _PATH_MNTTAB, _PATH_DUMPDATES);
+                             _PATH_MNTTAB, dumpdates);
                return;
        }