longname, nowin95, shortname, user=N, group=N, mask=N, and

dirmask=N.
nowin95, shortname, user=N, group=N, mask=N, and dirmask=N.
user=N, group=N, mask=N, and dirmask=N.

diff --git a/ChangeLog b/ChangeLog
index 7cf7c726f480c377bc1d48641a874678fa86b4aa..3c8772bdf3e5685b68605ac392897706eed8831f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,15 @@
 2005-10-19  Erez Zadok  <ezk@cs.sunysb.edu>
 
        * doc/am-utils.texi (opts Option): document new pcfs options
-       longname, nowin95, shortname, uid=N, gid=N, mask=N, and dirmask=N.
+       longname, nowin95, shortname, user=N, group=N, mask=N, and
+       dirmask=N.
 
        * amd/ops_pcfs.c (mount_pcfs): process new pcfs options longname,
-       nowin95, shortname, uid=N, gid=N, mask=N, and dirmask=N.
+       nowin95, shortname, user=N, group=N, mask=N, and dirmask=N.
 
        * include/am_compat.h: provide compatibility mnttab string names,
        if needed, for pcfs mount options longname, nowin95, shortname,
-       uid=N, gid=N, mask=N, and dirmask=N.
+       user=N, group=N, mask=N, and dirmask=N.
 
        * include/am_utils.h: extern for hasmntstr().
 

diff --git a/NEWS b/NEWS
index 5197109992a5b75c12d722344bf6e1a3cee26543..57801462181b56b593b7863d3ee9e22ffab7aedc 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
 *** Notes specific to am-utils version 6.2a2
 
 Support new mount options for type:=pcfs mounts: longname, nowin95,
-shortname, uid=N, gid=N, mask=N, and dirmask=N.
+shortname, user=N, group=N, mask=N, and dirmask=N.
 
 - Bugs fixed:
        * correctly print nfs_args->addr info (sin_family/port/addr)

diff --git a/amd/ops_pcfs.c b/amd/ops_pcfs.c
index b26d315279b9f226d2e55b1604bf782579aee145..10f7db23149b720c9e160e37efb4dab988a7cd10 100644 (file)
--- a/amd/ops_pcfs.c
+++ b/amd/ops_pcfs.c
@@ -160,7 +160,7 @@ mount_pcfs(char *mntdir, char *fs_name, char *opts, int on_autofs)
 
 #ifdef HAVE_PCFS_ARGS_T_UID
   pcfs_args.uid = 0;           /* default to root */
-  if ((str = hasmntstr(&mnt, MNTTAB_OPT_UID)) != NULL) {
+  if ((str = hasmntstr(&mnt, MNTTAB_OPT_USER)) != NULL) {
     struct passwd *pw;
     if ((pw = getpwnam(str)) != NULL)
       pcfs_args.uid = pw->pw_uid;
@@ -174,7 +174,7 @@ mount_pcfs(char *mntdir, char *fs_name, char *opts, int on_autofs)
 
 #ifdef HAVE_PCFS_ARGS_T_GID
   pcfs_args.gid = 0;           /* default to wheel/root group */
-  if ((str = hasmntstr(&mnt, MNTTAB_OPT_GID)) != NULL) {
+  if ((str = hasmntstr(&mnt, MNTTAB_OPT_GROUP)) != NULL) {
     struct group *gr;
     if ((gr = getgrnam(str)) != NULL)
       pcfs_args.gid = gr->gr_gid;

diff --git a/doc/am-utils.texi b/doc/am-utils.texi
index 6c379ca82ebac7f019a9cc0f1d9ac9f52dd1ee0d..4f4c0810263dc3d278c75192eb9217879b8849d4 100644 (file)
--- a/doc/am-utils.texi
+++ b/doc/am-utils.texi
@@ -2113,8 +2113,8 @@ Set ID of filesystem.
 Enable generations in ISO-9660 file systems.  Generations allow you to
 see all versions of a given file.
 
-@item gid=@var{n}
-@cindex Mount flags; gid
+@item group=@var{n}
+@cindex Mount flags; group
 For PCFS mounts, set the group of the files in the file system to
 @var{n} (which can either be a group name or a GID number).  The
 default group is the group of the directory on which the file system
@@ -2342,8 +2342,8 @@ support TCP/IP mounts.
 @cindex Mount flags; timeo
 The NFS timeout, in tenth-seconds, before a request is retransmitted.
 
-@item uid=@var{n}
-@cindex Mount flags; uid
+@item user=@var{n}
+@cindex Mount flags; user
 For PCFS mounts, set the owner of the files in the file system to
 @var{n} (which can either be a user name or a UID number).  The
 default owner is the owner of the directory on which the file system

diff --git a/include/am_compat.h b/include/am_compat.h
index 9901cda2359280923f8252e9268be98c2c59064a..2b9b595b555b1ec34140cdb39f0b8f8387cc351d 100644 (file)
--- a/include/am_compat.h
+++ b/include/am_compat.h
@@ -285,12 +285,12 @@
 #endif /* not MNTTAB_OPT_WSIZE */
 
 /* next four are useful for pcfs mounts */
-#ifndef MNTTAB_OPT_UID
-# define MNTTAB_OPT_UID "uid"
-#endif /* not MNTTAB_OPT_UID */
-#ifndef MNTTAB_OPT_GID
-# define MNTTAB_OPT_GID "gid"
-#endif /* not MNTTAB_OPT_GID */
+#ifndef MNTTAB_OPT_USER
+# define MNTTAB_OPT_USER "user"
+#endif /* not MNTTAB_OPT_USER */
+#ifndef MNTTAB_OPT_GROUP
+# define MNTTAB_OPT_GROUP "group"
+#endif /* not MNTTAB_OPT_GROUP */
 #ifndef MNTTAB_OPT_MASK
 # define MNTTAB_OPT_MASK "mask"
 #endif /* not MNTTAB_OPT_MASK */