4 files changed, 131 insertions, 4 deletions
diff --git a/docs/manpages/smbmnt.8 b/docs/manpages/smbmnt.8
new file mode 100644
index 0000000000..4f99b82ce6
--- /dev/null
+++ b/docs/manpages/smbmnt.8
@@ -0,0 +1,71 @@
+.TH SMBMNT 8 01/05/1998 smbmnt smbmnt
+.SH NAME
+smbmnt \- mount smb file system
+.SH SYNOPSIS
+.B smbmnt
+.B mount-point
+[
+.B -u
+.I uid
+] [
+.B -g
+.I gid
+] [
+.B -f
+.I file mode
+] [
+.B -d
+.I dir mode
+]
+
+.SH DESCRIPTION
+.B smbmnt 
+is a little helper application for the smbmount program. smbmnt is
+meant to be installed setuid root to enable normal users to mount
+their smb shares. Smbmnt checks whether the user calling it has write
+permissions on the mount point and then mounts the directory.
+
+.B -u
+.I uid,
+.B -g
+.I gid
+.RS 3
+A Lan Manager server does not tell us anything about the owner of a
+file. Unix requires that each file has an owner and a group it belongs
+to. With 
+.B -u
+and
+.B -g
+you can tell smbmount which id's it should assign to the files in the
+mounted direcory.
+
+The defaults for these values are the current uid and gid.
+.RE
+
+.B -f
+.I file mode,
+.B -d
+.I dir mode
+.RS 3
+Like 
+.B -u
+and
+.B -g,
+these options are also used to bridge differences in concepts between
+Lan Manager and unix. Lan Manager does not know anything about file
+permissions. So smbmount has to be told which permissions it should
+assign to the mounted files and direcories. The values have to be
+given as octal numbers. The default values are taken from the current
+umask, where the file mode is the current umask, and the dir mode adds
+execute permissions where the file mode gives read permissions.
+
+Note that these permissions can differ from the rights the server
+gives to us. If you do not have write permissions on the server, you
+can very well choose a file mode that tells that you have. This
+certainly cannot override the restrictions imposed by the server.
+.RE
+
+
+.SH SEE ALSO
+.B smbmount(8)
+
diff --git a/docs/manpages/smbmount.8 b/docs/manpages/smbmount.8
new file mode 100644
index 0000000000..f002cda027
--- /dev/null
+++ b/docs/manpages/smbmount.8
@@ -0,0 +1,32 @@
+.TH SMBMOUNT 8 01/05/1998 smbmount smbmount
+.SH NAME
+smbmount \- mount smb file system
+.SH SYNOPSIS
+.B smbmount
+[
+.B options
+]
+
+.SH DESCRIPTION
+.B smbmount 
+is a stripped down smbclient program. It only contains the mount
+command that itself calls the
+.B smbmnt(8)
+program to do the actual mount.
+.B smbmount
+itself accepts nearly the same options as
+.B smbclient(1)
+does. See the smbclient manpage for details.
+
+To mount an smb file system I suggest to use the option
+.B -c
+for smbclient. For example, use
+
+smbmount "\\\\server\\tmp" -c 'mount /mnt -u 123 -g 456'
+
+to mount the tmp share of server on /mnt, giving it a local uid 123
+and a local gid 456.
+
+.SH SEE ALSO
+.B smbmnt(8), smbclient(1)
+
diff --git a/docs/manpages/smbumount.8 b/docs/manpages/smbumount.8
new file mode 100644
index 0000000000..d28994e2fd
--- /dev/null
+++ b/docs/manpages/smbumount.8
@@ -0,0 +1,28 @@
+.TH SMBUMOUNT 8 20/6/1995 smbumount smbumount
+.SH NAME
+smbumount \- umount for normal users
+.SH SYNOPSIS
+.B smbumount
+.B mount-point
+
+.SH DESCRIPTION
+With this program, normal users can unmount smb-filesystems, provided
+that it is suid root.
+
+.B smbumount
+has been written to give normal linux-users more control over their
+resources. It is safe to install this program suid root, because only
+the user who has mounted a filesystem is allowed to unmount it again.
+
+For root it is not necessary to use smbumount. The normal umount
+program works perfectly well, but it would certainly be problematic to
+make umount setuid root.
+
+.SH OPTIONS
+.B mount-point
+.RS 3
+.B mount-point
+is the directory you want to unmount.
+
+.SH SEE ALSO
+.B smbmount(8)
diff --git a/source3/client/smbmount.c b/source3/client/smbmount.c
index 2ef426abc0..645523db0f 100644
--- a/source3/client/smbmount.c
+++ b/source3/client/smbmount.c
@@ -649,17 +649,13 @@ static void usage(char *pname)
   DEBUG(0,("\t-l log basename.      Basename for log/debug files\n"));
   DEBUG(0,("\t-n netbios name.      Use this name as my netbios name\n"));
   DEBUG(0,("\t-N                    don't ask for a password\n"));
-  DEBUG(0,("\t-P                    connect to service as a printer\n"));
-  DEBUG(0,("\t-M host               send a winpopup message to the host\n"));
   DEBUG(0,("\t-m max protocol       set the max protocol level\n"));
-  DEBUG(0,("\t-L host               get a list of shares available on a host\n"));
   DEBUG(0,("\t-I dest IP            use this IP to connect to\n"));
   DEBUG(0,("\t-E                    write messages to stderr instead of stdout\n"));
   DEBUG(0,("\t-U username           set the network username\n"));
   DEBUG(0,("\t-W workgroup          set the workgroup name\n"));
   DEBUG(0,("\t-c command string     execute semicolon separated commands\n"));
   DEBUG(0,("\t-t terminal code      terminal i/o code {sjis|euc|jis7|jis8|junet|hex}\n"));
-  DEBUG(0,("\t-T<c|x>IXgbNa          command line tar\n"));
   DEBUG(0,("\t-D directory          start from directory\n"));
   DEBUG(0,("\n"));
 }