BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.sbin / amd / config / mtab_aix.c

diff --git a/usr/src/usr.sbin/amd/config/mtab_aix.c b/usr/src/usr.sbin/amd/config/mtab_aix.c
index c4a0065..01d1b8e 100644 (file)
--- a/usr/src/usr.sbin/amd/config/mtab_aix.c
+++ b/usr/src/usr.sbin/amd/config/mtab_aix.c
@@ -1,6 +1,4 @@
 /*
 /*

- * $Id: mtab_aix.c,v 5.2 90/06/23 22:20:36 jsp Rel $
- *

  * Copyright (c) 1990 Jan-Simon Pendry
  * Copyright (c) 1990 Imperial College of Science, Technology & Medicine
  * Copyright (c) 1990 The Regents of the University of California.
  * Copyright (c) 1990 Jan-Simon Pendry
  * Copyright (c) 1990 Imperial College of Science, Technology & Medicine
  * Copyright (c) 1990 The Regents of the University of California.


@@ -9,9 +7,38 @@
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry at Imperial College, London.
  *
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry at Imperial College, London.
  *

- * %sccs.include.redist.c%
+ * 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. 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
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ *
+ *     @(#)mtab_aix.c  5.3 (Berkeley) 5/12/91
+ *
+ * $Id: mtab_aix.c,v 5.2.1.2 91/05/07 22:19:29 jsp Alpha $

  *
  *

- *     @(#)mtab_aix.c  5.1 (Berkeley) %G%

  */
 
 #include "am.h"
  */
 
 #include "am.h"


@@ -32,7 +59,12 @@ struct vmount *mp;
        new_mp->mnt_opts = strdup(vmt2dataptr(mp, VMT_ARGS));
        switch (mp->vmt_gfstype) {
        case MNT_JFS:  ty = MTAB_TYPE_UFS; break;
        new_mp->mnt_opts = strdup(vmt2dataptr(mp, VMT_ARGS));
        switch (mp->vmt_gfstype) {
        case MNT_JFS:  ty = MTAB_TYPE_UFS; break;

-       case MNT_NFS:  ty = MTAB_TYPE_NFS; break;
+       case MNT_NFS:
+               ty = MTAB_TYPE_NFS;
+               new_mp->mnt_fsname = str3cat(new_mp->mnt_fsname,
+                               vmt2dataptr(mp, VMT_HOSTNAME),
+                               ":", new_mp->mnt_fsname);
+               break;

        default:  ty = "unknown"; break;
        }
        new_mp->mnt_type = strdup(ty);
        default:  ty = "unknown"; break;
        }
        new_mp->mnt_type = strdup(ty);