pool/cifs-utils
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Update to cifs-utils 5.5.

Browse Source 
+ mount.cifs: don't pass credentials= option to the kernel
  + doc: update mailing list
  + mount.cifs: don't send a mandatory ver= option to the kernel
  + mount.cifs: remove smb2 multicall binary code
  + doc: remove old XML sources for mount.cifs.8 and cifs.upcall.8
  + mount.cifs: unused variables

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/cifs-utils?expand=0&rev=59
This commit is contained in:
Lars Müller 2012-05-30 11:16:27 +00:00 committed by Git OBS Bridge
parent bab4f11c74
commit 90771dbbf0
15 changed files with 12 additions and 1407 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

896
24ab7b063624340c0f0a3d5781522c203d8265f9.diff
View File

@ -1,896 +0,0 @@
commit 24ab7b063624340c0f0a3d5781522c203d8265f9
Author: Jeff Layton <jlayton@samba.org>
Date: Thu May 17 06:46:38 2012 -0400
doc: remove old XML sources for mount.cifs.8 and cifs.upcall.8
These files were added when I originally split these tools off from the
samba sources, but we haven't ever used them to build the actual
manpages and they haven't been maintained. Remove them.
Signed-off-by: Jeff Layton <jlayton@samba.org>
Index: doc/cifs.upcall.8.xml
===================================================================
--- doc/cifs.upcall.8.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
-<refentry id="cifs.upcall.8">
-
-
-<refmeta>
- <refentrytitle>cifs.upcall</refentrytitle>
- <manvolnum>8</manvolnum>
- <refmiscinfo class="source">cifs-utils</refmiscinfo>
- <refmiscinfo class="manual">System Administration tools</refmiscinfo>
- <refmiscinfo class="version">4.0</refmiscinfo>
-</refmeta>
-
-<refnamediv>
- <refname>cifs.upcall</refname>
- <refpurpose>Userspace upcall helper for Common Internet File System (CIFS)</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
- <cmdsynopsis>
- <command>cifs.upcall</command>
- <arg choice="opt">--trust-dns|-t</arg>
- <arg choice="opt">--version|-v</arg>
- <arg choice="req">keyid</arg>
- </cmdsynopsis>
-</refsynopsisdiv>
-
-
-<refsect1>
- <title>DESCRIPTION</title>
-
- <para>This tool is part of the cifs-utils suite.</para>
-
-<para>cifs.upcall is a userspace helper program for the linux CIFS client
-filesystem. There are a number of activities that the kernel cannot easily
-do itself. This program is a callout program that does these things for the
-kernel and then returns the result.</para>
-
-<para>cifs.upcall is generally intended to be run when the kernel calls
-request-key<manvolnum>8</manvolnum> for a particular key type. While it
-can be run directly from the command-line, it's not generally intended
-to be run that way.</para>
-</refsect1>
-
-<refsect1>
- <title>OPTIONS</title>
- <variablelist>
- <varlistentry>
- <term>-c</term>
- <listitem><para>This option is deprecated and is currently ignored.
- </para></listitem>
- </varlistentry>
- <varlistentry>
- <term>--trust-dns|-t</term>
- <listitem><para>With krb5 upcalls, the name used as the host portion of the service principal defaults to the hostname portion of the UNC. This option allows the upcall program to reverse resolve the network address of the server in order to get the hostname.</para>
- <para>This is less secure than not trusting DNS. When using this option, it's possible that an attacker could get control of DNS and trick the client into mounting a different server altogether. It's preferable to instead add server principals to the KDC for every possible hostname, but this option exists for cases where that isn't possible. The default is to not trust reverse hostname lookups in this fashion.
- </para></listitem>
- </varlistentry>
- <varlistentry>
- <term>--version|-v</term>
- <listitem><para>Print version number and exit.
- </para></listitem>
- </varlistentry>
- </variablelist>
-</refsect1>
-
-<refsect1>
- <title>CONFIGURATION FOR KEYCTL</title>
- <para>cifs.upcall is designed to be called from the kernel via the
- request-key callout program. This requires that request-key be told
- where and how to call this program. The current cifs.upcall program
- handles two different key types:
- </para>
-
- <variablelist>
- <varlistentry>
- <term>cifs.spnego</term>
- <listitem><para>This keytype is for retrieving kerberos session keys
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>dns_resolver</term>
- <listitem><para>This key type is for resolving hostnames into IP addresses
- </para></listitem>
- </varlistentry>
- </variablelist>
-
- <para>To make this program useful for CIFS, you'll need to set up entries for them in request-key.conf<manvolnum>5</manvolnum>. Here's an example of an entry for each key type:</para>
-<programlisting>
-#OPERATION TYPE D C PROGRAM ARG1 ARG2...
-#========= ============= = = ================================
-create cifs.spnego * * /usr/local/sbin/cifs.upcall %k
-create dns_resolver * * /usr/local/sbin/cifs.upcall %k
-</programlisting>
-<para>
-See <citerefentry><refentrytitle>request-key.conf<manvolnum>5</manvolnum></refentrytitle></citerefentry> for more info on each field.
-</para>
-</refsect1>
-
-<refsect1>
- <title>SEE ALSO</title>
- <para>
- <citerefentry><refentrytitle>request-key.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry>,
- <citerefentry><refentrytitle>mount.cifs</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>
- </para>
-</refsect1>
-
-<refsect1>
- <title>AUTHOR</title>
-
- <para>Igor Mammedov wrote the cifs.upcall program.</para>
- <para>Jeff Layton authored this manpage.</para>
- <para>The maintainer of the Linux CIFS VFS is Steve French.</para>
- <para>The <ulink url="mailto:linux-cifs@vger.kernel.org">Linux
- CIFS Mailing list</ulink> is the preferred place to ask
- questions regarding these programs.
- </para>
-</refsect1>
-
-</refentry>
Index: doc/mount.cifs.8.xml
===================================================================
--- doc/mount.cifs.8.xml
+++ /dev/null
@@ -1,751 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
-<refentry id="mount.cifs.8">
-
-<refmeta>
- <refentrytitle>mount.cifs</refentrytitle>
- <manvolnum>8</manvolnum>
- <refmiscinfo class="source">cifs-utils</refmiscinfo>
- <refmiscinfo class="manual">System Administration tools</refmiscinfo>
- <refmiscinfo class="version">4.0</refmiscinfo>
-</refmeta>
-
-
-<refnamediv>
- <refname>mount.cifs</refname>
- <refpurpose>mount using the Common Internet File System (CIFS)</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
- <cmdsynopsis>
-
- <command>mount.cifs</command>
- <arg choice="req">service</arg>
- <arg choice="req">mount-point</arg>
- <arg choice="opt">-o options</arg>
- </cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1>
- <title>DESCRIPTION</title>
-
- <para>This tool is part of the cifs-utils suite.</para>
-
- <para>mount.cifs mounts a Linux CIFS filesystem. It
-is usually invoked indirectly by
-the <citerefentry><refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum></citerefentry> command when using the
-"-t cifs" option. This command only works in Linux, and the kernel must
-support the cifs filesystem. The CIFS protocol is the successor to the
-SMB protocol and is supported by most Windows servers and many other
-commercial servers and Network Attached Storage appliances as well as
-by the popular Open Source server Samba.
- </para>
-
- <para>
- The mount.cifs utility attaches the UNC name (exported network resource)
- specified as <emphasis>service</emphasis> (using //server/share syntax,
- where "server" is the server name or IP address and "share" is the name
- of the share) to the local directory <emphasis>mount-point</emphasis>.
- </para>
-
- <para>
- Options to <emphasis>mount.cifs</emphasis> are specified as a comma-separated
-list of key=value pairs. It is possible to send options other
-than those listed here, assuming that the cifs filesystem kernel module (cifs.ko) supports them.
-Unrecognized cifs mount options passed to the cifs vfs kernel code will be logged to the
-kernel log.
-
- </para>
-
- <para><emphasis>mount.cifs</emphasis> causes the cifs vfs to launch a thread named cifsd. After mounting it keeps running until
- the mounted resource is unmounted (usually via the umount utility).
- </para>
-
- <para>
- <emphasis>mount.cifs -V</emphasis> command displays the version of cifs mount helper.
- </para>
- <para>
-
- <emphasis>modinfo cifs</emphasis> command displays the version of cifs module.
- </para>
-
-</refsect1>
-
-<refsect1>
- <title>OPTIONS</title>
- <variablelist>
- <varlistentry><term>user=<replaceable>arg</replaceable></term>
-
- <listitem><para>specifies the username to connect as. If
- this is not given, then the environment variable <emphasis>USER</emphasis> is used. This option can also take the
-form "user%password" or "workgroup/user" or
-"workgroup/user%password" to allow the password and workgroup
-to be specified as part of the username.
- </para>
-
-<note>
- <para>
- The cifs vfs accepts the parameter <parameter>user=</parameter>, or for users familiar with smbfs it accepts the longer form of the parameter <parameter>username=</parameter>. Similarly the longer smbfs style parameter names may be accepted as synonyms for the shorter cifs parameters <parameter>pass=</parameter>,<parameter>dom=</parameter> and <parameter>cred=</parameter>.
- </para>
-</note>
-
- </listitem>
- </varlistentry>
-
- <varlistentry><term>password=<replaceable>arg</replaceable></term>
-
- <listitem><para>specifies the CIFS password. If this
-option is not given then the environment variable
-<emphasis>PASSWD</emphasis> is used. If the password is not specified
-directly or indirectly via an argument to mount, <emphasis>mount.cifs</emphasis> will prompt
-for a password, unless the guest option is specified.
-</para>
-
-<para>Note that a password which contains the delimiter
-character (i.e. a comma ',') will fail to be parsed correctly
-on the command line. However, the same password defined
-in the PASSWD environment variable or via a credentials file (see
-below) or entered at the password prompt will be read correctly.
-</para>
- </listitem></varlistentry>
-
- <varlistentry><term>credentials=<replaceable>filename</replaceable></term>
-
- <listitem><para>
- specifies a file that contains a username
- and/or password and optionally the name of the
- workgroup. The format of the file is:
- </para>
-
-<programlisting>
- username=<replaceable>value</replaceable>
- password=<replaceable>value</replaceable>
- domain=<replaceable>value</replaceable>
-</programlisting>
-
- <para>
-This is preferred over having passwords in plaintext in a
-shared file, such as <filename>/etc/fstab</filename>. Be sure to protect any
-credentials file properly.
- </para>
- </listitem></varlistentry>
-
- <varlistentry>
- <term>uid=<replaceable>arg</replaceable></term>
- <listitem>
-
- <para>sets the uid that will own all files or directories on the
-mounted filesystem when the server does not provide ownership
-information. It may be specified as either a username or a numeric uid.
-When not specified, the default is uid 0. The mount.cifs helper must be
-at version 1.10 or higher to support specifying the uid in non-numeric
-form. See the section on FILE AND DIRECTORY OWNERSHIP AND PERMISSIONS below for more
-information. </para>
-
-</listitem>
-</varlistentry>
-
-<varlistentry>
- <term>forceuid</term>
- <listitem>
- <para>instructs the client to ignore any uid provided by
-the server for files and directories and to always assign the owner to
-be the value of the uid= option. See the section on FILE AND DIRECTORY OWNERSHIP AND PERMISSIONS below for more information.</para>
- </listitem>
-</varlistentry>
-
-<varlistentry>
- <term>gid=<replaceable>arg</replaceable></term>
- <listitem>
-
- <para>sets the gid that will own all files or
-directories on the mounted filesystem when the server does not provide
-ownership information. It may be specified as either a groupname or a
-numeric gid. When not specified, the default is gid 0. The mount.cifs
-helper must be at version 1.10 or higher to support specifying the gid
-in non-numeric form. See the section on FILE AND DIRECTORY OWNERSHIP AND
-PERMISSIONS below for more information.</para>
-
- </listitem>
-</varlistentry>
-
-<varlistentry>
- <term>forcegid</term>
- <listitem>
- <para>instructs the client to ignore any gid provided by
-the server for files and directories and to always assign the owner to
-be the value of the gid= option. See the section on FILE AND DIRECTORY OWNERSHIP AND PERMISSIONS below for more information.</para>
- </listitem>
-</varlistentry>
-
-<varlistentry>
- <term>port=<replaceable>arg</replaceable></term>
-
- <listitem><para>sets the port number on the server to attempt to contact to negotiate
-CIFS support. If the CIFS server is not listening on this port or
-if it is not specified, the default ports will be tried i.e.
-port 445 is tried and if no response then port 139 is tried.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>servern=<replaceable>arg</replaceable></term>
-
- <listitem><para>
- Specify the server netbios name (RFC1001 name) to use
- when attempting to setup a session to the server. Although
- rarely needed for mounting to newer servers, this option
- is needed for mounting to some older servers (such
- as OS/2 or Windows 98 and Windows ME) since when connecting
- over port 139 they, unlike most newer servers, do not
- support a default server name. A server name can be up
- to 15 characters long and is usually uppercased.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>netbiosname=<replaceable>arg</replaceable></term>
-
- <listitem><para>When mounting to servers via port 139, specifies the RFC1001
- source name to use to represent the client netbios machine
- name when doing the RFC1001 netbios session initialize.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>file_mode=<replaceable>arg</replaceable></term>
-
- <listitem><para>If the server does not support the CIFS Unix extensions this
- overrides the default file mode.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>dir_mode=<replaceable>arg</replaceable></term>
-
- <listitem><para>If the server does not support the CIFS Unix extensions this
- overrides the default mode for directories. </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>ip=<replaceable>arg</replaceable></term>
-
- <listitem><para>sets the destination IP address. This option is set automatically if the server name portion of the requested UNC name can be resolved so rarely needs to be specified by the user.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>domain=<replaceable>arg</replaceable></term>
-
- <listitem><para>sets the domain (workgroup) of the user </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>guest</term>
-
- <listitem><para>don't prompt for a password </para></listitem>
-
- </varlistentry>
-
- <varlistentry>
- <term>iocharset</term>
-
- <listitem><para>Charset used to convert local path names to and from
- Unicode. Unicode is used by default for network path
- names if the server supports it. If iocharset is
- not specified then the nls_default specified
- during the local client kernel build will be used.
- If server does not support Unicode, this parameter is
- unused. </para></listitem>
-
- </varlistentry>
-
- <varlistentry>
- <term>ro</term>
-
- <listitem><para>mount read-only</para></listitem>
-
- </varlistentry>
-
- <varlistentry>
- <term>rw</term>
- <listitem><para>mount read-write</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>setuids</term>
- <listitem><para>If the CIFS Unix extensions are negotiated with the server
- the client will attempt to set the effective uid and gid of
- the local process on newly created files, directories, and
- devices (create, mkdir, mknod). If the CIFS Unix Extensions
- are not negotiated, for newly created files and directories
- instead of using the default uid and gid specified on the
- the mount, cache the new file's uid and gid locally which means
- that the uid for the file can change when the inode is
- reloaded (or the user remounts the share).</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>nosetuids</term>
- <listitem><para>The client will not attempt to set the uid and gid on
- on newly created files, directories, and devices (create,
- mkdir, mknod) which will result in the server setting the
- uid and gid to the default (usually the server uid of the
- user who mounted the share). Letting the server (rather than
- the client) set the uid and gid is the default.If the CIFS
- Unix Extensions are not negotiated then the uid and gid for
- new files will appear to be the uid (gid) of the mounter or the
- uid (gid) parameter specified on the mount.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>perm</term>
- <listitem><para>Client does permission checks (vfs_permission check of uid
- and gid of the file against the mode and desired operation),
- Note that this is in addition to the normal ACL check on the
- target machine done by the server software.
- Client permission checking is enabled by default.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>noperm</term>
- <listitem><para>Client does not do permission checks. This can expose
- files on this mount to access by other users on the local
- client system. It is typically only needed when the server
- supports the CIFS Unix Extensions but the UIDs/GIDs on the
- client and server system do not match closely enough to allow
- access by the user doing the mount.
- Note that this does not affect the normal ACL check on the
- target machine done by the server software (of the server
- ACL against the user name provided at mount time).</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>dynperm</term>
- <listitem><para>Instructs the server to maintain ownership and
-permissions in memory that can't be stored on the server. This information can disappear at any time (whenever the inode is flushed from the cache), so while this may help make some applications work, it's behavior is somewhat unreliable. See the section below on FILE AND DIRECTORY OWNERSHIP AND PERMISSIONS for more information.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>directio</term>
- <listitem><para>Do not do inode data caching on files opened on this mount.
- This precludes mmaping files on this mount. In some cases
- with fast networks and little or no caching benefits on the
- client (e.g. when the application is doing large sequential
- reads bigger than page size without rereading the same data)
- this can provide better performance than the default
- behavior which caches reads (readahead) and writes
- (writebehind) through the local Linux client pagecache
- if oplock (caching token) is granted and held. Note that
- direct allows write operations larger than page size
- to be sent to the server. On some kernels this requires the cifs.ko module
- to be built with the CIFS_EXPERIMENTAL configure option.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>mapchars</term>
- <listitem><para>Translate six of the seven reserved characters (not backslash, but including the colon, question mark, pipe, asterik, greater than and less than characters)
- to the remap range (above 0xF000), which also
- allows the CIFS client to recognize files created with
- such characters by Windows's POSIX emulation. This can
- also be useful when mounting to most versions of Samba
- (which also forbids creating and opening files
- whose names contain any of these seven characters).
- This has no effect if the server does not support
- Unicode on the wire. Please note that the files created
- with mapchars mount option may not be accessible
- if the share is mounted without that option.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>nomapchars</term>
- <listitem><para>Do not translate any of these seven characters (default)</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>intr</term>
- <listitem><para>currently unimplemented</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>nointr</term>
- <listitem><para>(default) currently unimplemented </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>hard</term>
- <listitem><para>The program accessing a file on the cifs mounted file system will hang when the
- server crashes.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>soft</term>
- <listitem><para>(default) The program accessing a file on the cifs mounted file system will not hang when the server crashes and will return errors to the user application.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>noacl</term>
- <listitem><para>Do not allow POSIX ACL operations even if server would support them.</para><para>
- The CIFS client can get and set POSIX ACLs (getfacl, setfacl) to Samba servers
- version 3.0.10 and later. Setting POSIX ACLs requires enabling both XATTR and
- then POSIX support in the CIFS configuration options when building the cifs
- module. POSIX ACL support can be disabled on a per mount basis by specifying
- "noacl" on mount.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>nocase</term>
- <listitem>
- <para>Request case insensitive path name matching (case
- sensitive is the default if the server suports it).
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>sec=</term>
- <listitem>
- <para>Security mode. Allowed values are:</para>
- <itemizedlist>
- <listitem><para>none attempt to connection as a null user (no name) </para></listitem>
- <listitem><para>krb5 Use Kerberos version 5 authentication</para></listitem>
- <listitem><para>krb5i Use Kerberos authentication and packet signing</para></listitem>
- <listitem><para>ntlm Use NTLM password hashing (default)</para></listitem>
- <listitem><para>ntlmi Use NTLM password hashing with signing (if
- /proc/fs/cifs/PacketSigningEnabled on or if
- server requires signing also can be the default)</para></listitem>
- <listitem><para>ntlmv2 Use NTLMv2 password hashing</para></listitem>
- <listitem><para>ntlmv2i Use NTLMv2 password hashing with packet signing</para></listitem>
- </itemizedlist>
-
- <para>[NB This [sec parameter] is under development and expected to be available in cifs kernel module 1.40 and later]
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>nobrl</term>
- <listitem>
- <para>Do not send byte range lock requests to the server.
- This is necessary for certain applications that break
- with cifs style mandatory byte range locks (and most
- cifs servers do not yet support requesting advisory
- byte range locks).
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>sfu</term>
- <listitem>
- <para>
- When the CIFS Unix Extensions are not negotiated, attempt to
- create device files and fifos in a format compatible with
- Services for Unix (SFU). In addition retrieve bits 10-12
- of the mode via the SETFILEBITS extended attribute (as
- SFU does). In the future the bottom 9 bits of the mode
- mode also will be emulated using queries of the security
- descriptor (ACL). [NB: requires version 1.39 or later
- of the CIFS VFS. To recognize symlinks and be able
- to create symlinks in an SFU interoperable form
- requires version 1.40 or later of the CIFS VFS kernel module.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>serverino</term>
- <listitem><para>Use inode numbers (unique persistent file identifiers)
- returned by the server instead of automatically generating
- temporary inode numbers on the client. Although server inode numbers
- make it easier to spot hardlinked files (as they will have
- the same inode numbers) and inode numbers may be persistent (which is
- userful for some sofware),
- the server does not guarantee that the inode numbers
- are unique if multiple server side mounts are exported under a
- single share (since inode numbers on the servers might not
- be unique if multiple filesystems are mounted under the same
- shared higher level directory). Note that not all
- servers support returning server inode numbers, although
- those that support the CIFS Unix Extensions, and Windows 2000 and
- later servers typically do support this (although not necessarily
- on every local server filesystem). Parameter has no effect if
- the server lacks support for returning inode numbers or equivalent.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>noserverino</term>
- <listitem>
- <para>
- Client generates inode numbers (rather than
- using the actual one from the server) by default.
- </para>
- <para>
- See section <emphasis>INODE NUMBERS</emphasis> for
- more information.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>nounix</term>
- <listitem>
- <para>
- Disable the CIFS Unix Extensions for this mount. This
- can be useful in order to turn off multiple settings at once.
- This includes POSIX acls, POSIX locks, POSIX paths, symlink
- support and retrieving uids/gids/mode from the server. This
- can also be useful to work around a bug in a server that
- supports Unix Extensions.
- </para>
- <para>
- See section <emphasis>INODE NUMBERS</emphasis> for
- more information.
- </para> </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>nouser_xattr</term>
- <listitem><para>(default) Do not allow getfattr/setfattr to get/set xattrs, even if server would support it otherwise. </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>rsize=<replaceable>arg</replaceable></term>
- <listitem><para>default network read size (usually 16K). The client currently
- can not use rsize larger than CIFSMaxBufSize. CIFSMaxBufSize
- defaults to 16K and may be changed (from 8K to the maximum
- kmalloc size allowed by your kernel) at module install time
- for cifs.ko. Setting CIFSMaxBufSize to a very large value
- will cause cifs to use more memory and may reduce performance
- in some cases. To use rsize greater than 127K (the original
- cifs protocol maximum) also requires that the server support
- a new Unix Capability flag (for very large read) which some
- newer servers (e.g. Samba 3.0.26 or later) do. rsize can be
- set from a minimum of 2048 to a maximum of 130048 (127K or
- CIFSMaxBufSize, whichever is smaller)
-
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>wsize=<replaceable>arg</replaceable></term>
-
- <listitem><para>default network write size (default 57344)
- maximum wsize currently allowed by CIFS is 57344 (fourteen
- 4096 byte pages)</para></listitem>
- </varlistentry>
- <varlistentry>
- <term>fsc</term>
-
- <listitem><para>Enable local disk caching using FS-Cache
- for cifs. This option could be useful to improve performance
- on a slow link, heavily loaded server and/or network
- where reading from the disk is faster than reading from the
- server (over the network). This could also impact the
- scalability positively as the number of calls to the server
- are reduced. But, be warned that local caching is not suitable
- for all workloads, for e.g., read-once type workloads. So
- you need to consider carefully the situation/workload before
- using this option. Currently, local disk caching is enabled
- for CIFS files opened as read-only.
- NOTE: This feature is available only in the recent kernels
- that have been built with the kernel config option
- CONFIG_CIFS_FSCACHE. You also need to have cachefilesd daemon
- installed and running to make the cache operational.
- </para></listitem>
- </varlistentry>
- <varlistentry>
- <term>--verbose</term>
- <listitem><para>Print additional debugging information for the mount. Note that this parameter must be specified before the -o. For example:</para><para>mount -t cifs //server/share /mnt --verbose -o user=username</para></listitem>
- </varlistentry>
-
-
- </variablelist>
-</refsect1>
-
-<refsect1>
- <title>SERVICE FORMATTING AND DELIMITERS</title>
-
- <para>
- It's generally preferred to use forward slashes (/) as a delimiter in service names. They are considered to be the "universal delimiter" since they are generally not allowed to be embedded within path components on Windows machines and the client can convert them to blackslashes (\) unconditionally. Conversely, backslash characters are allowed by POSIX to be part of a path component, and can't be automatically converted in the same way.
- </para>
- <para>
- mount.cifs will attempt to convert backslashes to forward slashes where it's able to do so, but it cannot do so in any path component following the sharename.
- </para>
-</refsect1>
-
-<refsect1>
- <title>INODE NUMBERS</title>
- <para>
- When Unix Extensions are enabled, we use the actual inode
- number provided by the server in response to the POSIX calls as an
- inode number.
- </para>
- <para>
- When Unix Extensions are disabled and "serverino" mount option
- is enabled there is no way to get the server inode number. The
- client typically maps the server-assigned "UniqueID" onto an inode
- number.
- </para>
- <para>
- Note that the UniqueID is a different value from the server
- inode number. The UniqueID value is unique over the scope of the entire
- server and is often greater than 2 power 32. This value often makes
- programs that are not compiled with LFS (Large File Support), to
- trigger a glibc EOVERFLOW error as this won't fit in the target
- structure field. It is strongly recommended to compile your programs
- with LFS support (i.e. with -D_FILE_OFFSET_BITS=64) to prevent this
- problem. You can also use "noserverino" mount option to generate inode
- numbers smaller than 2 power 32 on the client. But you may not be able
- to detect hardlinks properly.
- </para>
-</refsect1>
-
-<refsect1>
- <title>FILE AND DIRECTORY OWNERSHIP AND PERMISSIONS</title>
-
- <para> The core CIFS protocol does not provide unix ownership
-information or mode for files and directories. Because of this, files
-and directories will generally appear to be owned by whatever values the
-uid= or gid= options are set, and will have permissions set to the
-default file_mode and dir_mode for the mount. Attempting to change these
-values via chmod/chown will return success but have no effect.</para>
-
- <para>When the client and server negotiate unix extensions,
-files and directories will be assigned the uid, gid, and mode provided
-by the server. Because CIFS mounts are generally single-user, and the
-same credentials are used no matter what user accesses the mount, newly
-created files and directories will generally be given ownership
-corresponding to whatever credentials were used to mount the
-share.</para>
-
- <para>If the uid's and gid's being used do not match on the
-client and server, the forceuid and forcegid options may be helpful.
-Note however, that there is no corresponding option to override the
-mode. Permissions assigned to a file when forceuid or forcegid are in
-effect may not reflect the the real permissions.</para>
-
- <para>When unix extensions are not negotiated, it's also
-possible to emulate them locally on the server using the "dynperm" mount
-option. When this mount option is in effect, newly created files and
-directories will receive what appear to be proper permissions. These
-permissions are not stored on the server however and can disappear at
-any time in the future (subject to the whims of the kernel flushing out
-the inode cache). In general, this mount option is discouraged.
- </para>
-
- <para>It's also possible to override permission checking on the client
-altogether via the noperm option. Server-side permission checks cannot be
-overriden. The permission checks done by the server will always correspond to
-the credentials used to mount the share, and not necessarily to the user who is accessing the share.</para>
-
-</refsect1>
-
-<refsect1>
- <title>ENVIRONMENT VARIABLES</title>
-
- <para>
- The variable <emphasis>USER</emphasis> may contain the username of the
-person to be used to authenticate to the server.
-The variable can be used to set both username and
-password by using the format username%password.
- </para>
-
- <para>
- The variable <emphasis>PASSWD</emphasis> may contain the password of the
-person using the client.
- </para>
-
- <para>
- The variable <emphasis>PASSWD_FILE</emphasis> may contain the pathname
-of a file to read the password from. A single line of input is
-read and used as the password.
- </para>
-
-</refsect1>
-
-<refsect1>
- <title>NOTES</title>
-
- <para>This command may be used only by root, unless installed setuid, in which case the noeexec and nosuid mount flags are enabled. When installed as a setuid program, the program follows the conventions set forth by the mount program for user mounts.</para>
-
- <para>
- Some samba client tools like smbclient(8) honour client-side
- configuration parameters present in smb.conf. Unlike those
- client tools, <emphasis>mount.cifs</emphasis> ignores smb.conf
- completely.
- </para>
-
-</refsect1>
-
-<refsect1>
- <title>CONFIGURATION</title>
- <para>
-The primary mechanism for making configuration changes and for reading
-debug information for the cifs vfs is via the Linux /proc filesystem.
-In the directory <filename>/proc/fs/cifs</filename> are various
-configuration files and pseudo files which can display debug information.
-There are additional startup options such as maximum buffer size and number
-of buffers which only may be set when the kernel cifs vfs (cifs.ko module) is
-loaded. These can be seen by running the modinfo utility against the file
-cifs.ko which will list the options that may be passed to cifs during module
-installation (device driver load).
-For more information see the kernel file <filename>fs/cifs/README</filename>.
-</para>
-</refsect1>
-
-<refsect1>
- <title>BUGS</title>
-
- <para>Mounting using the CIFS URL specification is currently not supported.
- </para>
-
- <para>The credentials file does not handle usernames or passwords with
- leading space.</para>
-
- <para>
-Note that the typical response to a bug report is a suggestion
-to try the latest version first. So please try doing that first,
-and always include which versions you use of relevant software
-when reporting bugs (minimum: mount.cifs (try mount.cifs -V), kernel (see /proc/version) and
-server type you are trying to contact.
-</para>
-</refsect1>
-
-
-
-<refsect1>
- <title>VERSION</title>
-
- <para>This man page is correct for version 1.52 of
- the cifs vfs filesystem (roughly Linux kernel 2.6.24).</para>
-</refsect1>
-
-<refsect1>
- <title>SEE ALSO</title>
- <para>
- Documentation/filesystems/cifs.txt and fs/cifs/README in the linux kernel
- source tree may contain additional options and information.
-</para>
- <para><citerefentry><refentrytitle>umount.cifs</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry></para>
-
-</refsect1>
-
-<refsect1>
- <title>AUTHOR</title>
-
- <para>Steve French</para>
-
- <para>The syntax and manpage were loosely based on that of smbmount. It
- was converted to Docbook/XML by Jelmer Vernooij.</para>
-
- <para>The maintainer of the Linux cifs vfs and the userspace
- tool <emphasis>mount.cifs</emphasis> is <ulink url="mailto:sfrench@samba.org">Steve French</ulink>.
- The <ulink url="mailto:linux-cifs@vger.kernel.org">Linux CIFS Mailing list</ulink>
- is the preferred place to ask questions regarding these programs.
- </para>
-
-</refsect1>
-
-</refentry>

70
8c6268cbbd4202631e5c4b30297adc0088a1d568.diff
View File

@ -1,70 +0,0 @@
commit 8c6268cbbd4202631e5c4b30297adc0088a1d568
Author: Jeff Layton <jlayton@samba.org>
Date: Thu Apr 19 07:29:46 2012 -0400
mount.cifs: fix up some -D_FORTIFY_SOURCE=2 warnings
...and add -D_FORTIFY_SOURCE=2 to the default $CFLAGS.
Acked-by: Acked-by: Suresh Jayaraman <sjayaraman@suse.com>
Signed-off-by: Jeff Layton <jlayton@samba.org>
Index: cifs-utils-5.4/Makefile.am
===================================================================
--- cifs-utils-5.4.orig/Makefile.am
+++ cifs-utils-5.4/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = -Wall -Wextra -Werror
+AM_CFLAGS = -Wall -Wextra -Werror -D_FORTIFY_SOURCE=2
ACLOCAL_AMFLAGS = -I aclocal
root_sbindir = $(ROOTSBINDIR)
Index: cifs-utils-5.4/mount.cifs.c
===================================================================
--- cifs-utils-5.4.orig/mount.cifs.c
+++ cifs-utils-5.4/mount.cifs.c
@@ -927,11 +927,11 @@ parse_options(const char *data, struct p
return EX_USAGE;
}
} else {
- /* domain/username%password */
- const int max = MAX_DOMAIN_SIZE +
- MAX_USERNAME_SIZE +
- MOUNT_PASSWD_SIZE + 2;
- if (strnlen(value, max + 1) >= max + 1) {
+ /* domain/username%password + NULL term. */
+ const size_t max = MAX_DOMAIN_SIZE +
+ MAX_USERNAME_SIZE +
+ MOUNT_PASSWD_SIZE + 2 + 1;
+ if (strnlen(value, max) >= max) {
fprintf(stderr, "username too long\n");
return EX_USAGE;
}
@@ -1603,8 +1603,10 @@ add_mtab(char *devname, char *mountpoint
mountent.mnt_passno = 0;
rc = addmntent(pmntfile, &mountent);
if (rc) {
+ int ignore __attribute__((unused));
+
fprintf(stderr, "unable to add mount entry to mtab\n");
- ftruncate(fd, statbuf.st_size);
+ ignore = ftruncate(fd, statbuf.st_size);
rc = EX_FILEIO;
}
tmprc = my_endmntent(pmntfile, statbuf.st_size);
Index: cifs-utils-5.4/mtab.c
===================================================================
--- cifs-utils-5.4.orig/mtab.c
+++ cifs-utils-5.4/mtab.c
@@ -271,8 +271,10 @@ my_endmntent(FILE *stream, off_t size)
/* truncate file back to "size" -- best effort here */
if (rc) {
+ int ignore __attribute__((unused));
+
rc = errno;
- ftruncate(fd, size);
+ ignore = ftruncate(fd, size);
}
endmntent(stream);

47
9410c776a3bd69a8434e5f01174bc59f08e7e62a.diff
View File

@ -1,47 +0,0 @@
commit 9410c776a3bd69a8434e5f01174bc59f08e7e62a
Author: Jeff Layton <jlayton@samba.org>
Date: Mon May 14 06:41:29 2012 -0400
doc: update mailing list
Signed-off-by: Luk Claes <luk@debian.org>
Index: configure.ac
===================================================================
--- configure.ac.orig
+++ configure.ac
@@ -1,7 +1,7 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-AC_INIT([cifs-utils], [5.4], [cifs-utils@samba.org], [cifs-utils], [https://wiki.samba.org/index.php/LinuxCIFS_utils])
+AC_INIT([cifs-utils], [5.4.1], [linux-cifs@vger.kernel.org], [cifs-utils], [https://wiki.samba.org/index.php/LinuxCIFS_utils])
AC_CONFIG_SRCDIR([replace.h])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_FILES([Makefile contrib/Makefile contrib/request-key.d/Makefile])
Index: doc/cifs.upcall.8.xml
===================================================================
--- doc/cifs.upcall.8.xml.orig
+++ doc/cifs.upcall.8.xml
@@ -114,7 +114,7 @@ See <citerefentry><refentrytitle>request
<para>Igor Mammedov wrote the cifs.upcall program.</para>
<para>Jeff Layton authored this manpage.</para>
<para>The maintainer of the Linux CIFS VFS is Steve French.</para>
- <para>The <ulink url="mailto:linux-cifs-client@lists.samba.org">Linux
+ <para>The <ulink url="mailto:linux-cifs@vger.kernel.org">Linux
CIFS Mailing list</ulink> is the preferred place to ask
questions regarding these programs.
</para>
Index: doc/mount.cifs.8.xml
===================================================================
--- doc/mount.cifs.8.xml.orig
+++ doc/mount.cifs.8.xml
@@ -742,7 +742,7 @@ server type you are trying to contact.
<para>The maintainer of the Linux cifs vfs and the userspace
tool <emphasis>mount.cifs</emphasis> is <ulink url="mailto:sfrench@samba.org">Steve French</ulink>.
- The <ulink url="mailto:linux-cifs-client@lists.samba.org">Linux CIFS Mailing list</ulink>
+ The <ulink url="mailto:linux-cifs@vger.kernel.org">Linux CIFS Mailing list</ulink>
is the preferred place to ask questions regarding these programs.
</para>

64
9e3c3c4b4ae4c3e9eb2eb6297c31c50337b2fd07.diff
View File

@ -1,64 +0,0 @@
commit 9e3c3c4b4ae4c3e9eb2eb6297c31c50337b2fd07
Author: Jeff Layton <jlayton@samba.org>
Date: Thu May 17 06:46:38 2012 -0400
mount.cifs: don't send a mandatory ver= option to the kernel
Traditionally, this ver= option was used to specify the "options
version" that we're passing in. It has always been set to '1' though
and we have never changed that.
Eventually we want to have a ver= (or vers=) option that allows users
to specify the SMB version that they want to use to talk to the server.
At that point, this option will just get in the way. Let's go ahead
and remove it now in preparation for that day.
Signed-off-by: Jeff Layton <jlayton@samba.org>
Index: mount.cifs.c
===================================================================
--- mount.cifs.c.orig
+++ mount.cifs.c
@@ -100,12 +100,6 @@
#define MAX_DOMAIN_SIZE 64
/*
- * value of the ver= option that gets passed to the kernel. Used to indicate
- * behavioral changes introduced in the mount helper.
- */
-#define OPTIONS_VERSION "1"
-
-/*
* mount.cifs has been the subject of many "security" bugs that have arisen
* because of users and distributions installing it as a setuid root program
* before it had been audited for security holes. The default behavior is
@@ -1833,21 +1827,21 @@ assemble_mountinfo(struct parsed_mount_i
goto assemble_exit;
}
- /* copy in ver= string. It's not really needed, but what the hell */
- if (*parsed_info->options)
- strlcat(parsed_info->options, ",", sizeof(parsed_info->options));
- strlcat(parsed_info->options, "ver=", sizeof(parsed_info->options));
- strlcat(parsed_info->options, OPTIONS_VERSION, sizeof(parsed_info->options));
-
/* copy in user= string */
if (parsed_info->got_user) {
- strlcat(parsed_info->options, ",user=",
+ if (*parsed_info->options)
+ strlcat(parsed_info->options, ",",
+ sizeof(parsed_info->options));
+ strlcat(parsed_info->options, "user=",
sizeof(parsed_info->options));
strlcat(parsed_info->options, parsed_info->username,
sizeof(parsed_info->options));
}
if (*parsed_info->domain) {
+ if (*parsed_info->options)
+ strlcat(parsed_info->options, ",",
+ sizeof(parsed_info->options));
strlcat(parsed_info->options, ",domain=",
sizeof(parsed_info->options));
strlcat(parsed_info->options, parsed_info->domain,

38
bab572a89bd0d989bd761e8cea926dfcf48b938d.diff
View File

@ -1,38 +0,0 @@
commit bab572a89bd0d989bd761e8cea926dfcf48b938d
Author: Jeff Layton <jlayton@samba.org>
Date: Wed May 2 14:25:28 2012 -0400
mount.cifs: don't pass credentials= option to the kernel
We handle this option in userspace, so there's little value in also
passing it to the kernel.
Also fix minor double-comma nit in the options string.
Reported-by: Ronald <ronald645@gmail.com>
Signed-off-by: Jeff Layton <jlayton@samba.org>
Index: mount.cifs.c
===================================================================
--- mount.cifs.c.orig
+++ mount.cifs.c
@@ -1023,7 +1023,7 @@ parse_options(const char *data, struct p
rc, strerror(rc), value);
return rc;
}
- break;
+ goto nocopy;
case OPT_UID:
if (!value || !*value)
@@ -1834,7 +1834,9 @@ assemble_mountinfo(struct parsed_mount_i
}
/* copy in ver= string. It's not really needed, but what the hell */
- strlcat(parsed_info->options, ",ver=", sizeof(parsed_info->options));
+ if (*parsed_info->options)
+ strlcat(parsed_info->options, ",", sizeof(parsed_info->options));
+ strlcat(parsed_info->options, "ver=", sizeof(parsed_info->options));
strlcat(parsed_info->options, OPTIONS_VERSION, sizeof(parsed_info->options));
/* copy in user= string */

21
bkup-uid-gid-uninitialized.diff
View File

@ -1,21 +0,0 @@
Author: Lars Mueller <lmuelle@suse.com>
Subject: cifs-utils build warns bkupuid and bkupgid may be used uninitialized
Bugzilla: na
Upstream-Reported: http://permalink.gmane.org/gmane.linux.kernel.cifs/5931
Upstream-Acknowledged: Yes
Index: cifs-utils-5.4/mount.cifs.c
===================================================================
--- cifs-utils-5.4.orig/mount.cifs.c
+++ cifs-utils-5.4/mount.cifs.c
@@ -863,8 +863,8 @@ parse_options(const char *data, struct p
int got_uid = 0;
int got_cruid = 0;
int got_gid = 0;
- uid_t uid, cruid = 0, bkupuid;
- gid_t gid, bkupgid;
+ uid_t uid, cruid = 0, bkupuid = 0;
+ gid_t gid, bkupgid = 0;
char *ep;
struct passwd *pw;
struct group *gr;

26
cb8d28e9550baf674e20fbbe162c0a4bcf20be6b.diff
View File

@ -1,26 +0,0 @@
commit cb8d28e9550baf674e20fbbe162c0a4bcf20be6b
Author: Luk Claes <luk@debian.org>
Date: Sat May 19 06:37:21 2012 -0400
mount.cifs: unused variables
Index: mount.cifs.c
===================================================================
--- mount.cifs.c.orig
+++ mount.cifs.c
@@ -525,13 +525,13 @@ free_caps:
}
#else /* HAVE_LIBCAP */
static int
-drop_capabilities(int parent)
+drop_capabilities(int parent __attribute((unused)))
{
return 0;
}
static int
-toggle_dac_capability(int writable, int enable)
+toggle_dac_capability(int writable __attribute((unused)), int enable __attribute((unused)))
{
return 0;
}

3
cifs-utils-5.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f6c267e4cfb111ab47a6e85a802373475edaab31d76eab4e7927ea6fe82e7f7b
size 381416

3
cifs-utils-5.5.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:82719a7988025eec87846d581a7b913368419d33deaafbecafd519fcb194d5c6
size 377435

15
cifs-utils.changes
View File

@ -1,12 +1,13 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Sat May 26 11:41:59 UTC 2012 - lmuelle@suse.com Wed May 30 11:09:43 UTC 2012 - lmuelle@suse.com
- mount.cifs: don't pass credentials= option to the kernel. - Update to cifs-utils 5.5.
- doc: update mailing list. + mount.cifs: don't pass credentials= option to the kernel
- mount.cifs: don't send a mandatory ver= option to the kernel. + doc: update mailing list
- mount.cifs: remove smb2 multicall binary code. + mount.cifs: don't send a mandatory ver= option to the kernel
- doc: remove old XML sources for mount.cifs.8 and cifs.upcall.8. + mount.cifs: remove smb2 multicall binary code
- mount.cifs: unused variables. + doc: remove old XML sources for mount.cifs.8 and cifs.upcall.8
+ mount.cifs: unused variables
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 16 16:29:18 UTC 2012 - lmuelle@suse.com Wed May 16 16:29:18 UTC 2012 - lmuelle@suse.com

24
cifs-utils.spec
View File

@ -17,7 +17,7 @@
Name: cifs-utils Name: cifs-utils
Version: 5.4 Version: 5.5
Release: 0 Release: 0
Summary: Utilities for doing and managing mounts of the Linux CIFS filesyste Summary: Utilities for doing and managing mounts of the Linux CIFS filesyste
License: GPL-3.0+ License: GPL-3.0+
@ -27,17 +27,6 @@ Source: %{name}-%{version}.tar.bz2
Source1: cifs.init Source1: cifs.init
Source2: mkinitrd_scripts_boot-cifs.sh Source2: mkinitrd_scripts_boot-cifs.sh
Source3: mkinitrd_scripts_setup-cifs.sh Source3: mkinitrd_scripts_setup-cifs.sh
Patch: 8c6268cbbd4202631e5c4b30297adc0088a1d568.diff
Patch1: bkup-uid-gid-uninitialized.diff
Patch2: krb5_auth_con_set_req_cksumtype-implicit-declaration.diff
Patch3: mount.cifs-toggle_dac_capability-return-stored-returncode.diff
Patch4: mount.cifs-toggle_dac_capability-remove-check.diff
Patch5: bab572a89bd0d989bd761e8cea926dfcf48b938d.diff
Patch6: 9410c776a3bd69a8434e5f01174bc59f08e7e62a.diff
Patch7: 9e3c3c4b4ae4c3e9eb2eb6297c31c50337b2fd07.diff
Patch8: f161532355c1b410a308bd165c60c2b1e6d6691c.diff
Patch9: 24ab7b063624340c0f0a3d5781522c203d8265f9.diff
Patch10: cb8d28e9550baf674e20fbbe162c0a4bcf20be6b.diff
%if 0%{?suse_version} %if 0%{?suse_version}
PreReq: insserv %{?fillup_prereq} mkinitrd PreReq: insserv %{?fillup_prereq} mkinitrd
%else %else
@ -90,17 +79,6 @@ the Linux CIFS filesystem.
%prep %prep
%setup -q %setup -q
%patch -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p0
%patch6 -p0
%patch7 -p0
%patch8 -p0
%patch9 -p0
%patch10 -p0
%build %build
autoreconf --force --install autoreconf --force --install

129
f161532355c1b410a308bd165c60c2b1e6d6691c.diff
View File

@ -1,129 +0,0 @@
commit f161532355c1b410a308bd165c60c2b1e6d6691c
Author: Jeff Layton <jlayton@samba.org>
Date: Thu May 17 06:46:38 2012 -0400
mount.cifs: remove smb2 multicall binary code
This was added when it was thought that smb2 would be a different fstype
altogether. Now that we are not adding a separate fstype, this code is
no longer needed since nothing will ever call /sbin/mount.smb2.
Cc: Steve French <smfrench@gmail.com>
Signed-off-by: Jeff Layton <jlayton@samba.org>
Index: mount.cifs.c
===================================================================
--- mount.cifs.c.orig
+++ mount.cifs.c
@@ -181,7 +181,6 @@ struct parsed_mount_info {
const char *thisprogram;
const char *cifs_fstype = "cifs";
-const char *smb2_fstype = "smb2";
static int parse_unc(const char *unc_name, struct parsed_mount_info *parsed_info);
@@ -250,7 +249,7 @@ check_fstab(const char *progname, const
BB end finish BB */
-static int mount_cifs_usage(FILE * stream)
+static int mount_usage(FILE * stream)
{
fprintf(stream, "\nUsage: %s <remotetarget> <dir> -o <options>\n",
thisprogram);
@@ -290,52 +289,6 @@ static int mount_cifs_usage(FILE * strea
return 0;
}
-static int mount_smb2_usage(FILE *stream)
-{
- fprintf(stream, "\nUsage: %s <remotetarget> <dir> -o <options>\n",
- thisprogram);
- fprintf(stream, "\nMount the remote target, specified as a UNC name,");
- fprintf(stream, " to a local directory.\n\nOptions:\n");
- fprintf(stream, "\tuser=<arg>\n\tpass=<arg>\n\tdom=<arg>\n");
- fprintf(stream, "\nLess commonly used options:");
- fprintf(stream,
- "\n\tcredentials=<filename>,guest,perm,noperm,rw,ro,");
- fprintf(stream,
- "\n\tsep=<char>,iocharset=<codepage>,exec,noexec");
- fprintf(stream,
- "\n\tnolock,directio,sec=<authentication mechanism>,sign");
- fprintf(stream,
- "\n\tuid=<uid>,gid=<gid>,dir_mode=<mode>,file_mode=<mode>");
- fprintf(stream, "\n\nRarely used options:");
- fprintf(stream,
- "\n\tport=<tcpport>,rsize=<size>,wsize=<size>,unc=<unc_name>,ip=<ip_address>,");
- fprintf(stream,
- "\n\tdev,nodev,hard,soft,intr,");
- fprintf(stream,
- "\n\tnointr,ignorecase,noacl,prefixpath=<path>,nobrl");
- fprintf(stream,
- "\n\nOptions are described in more detail in the manual page");
- fprintf(stream, "\n\tman 8 mount.smb2\n");
- fprintf(stream, "\nTo display the version number of the mount helper:");
- fprintf(stream, "\n\tmount.smb2 -V\n");
-
- if (stream == stderr)
- return EX_USAGE;
- return 0;
-}
-
-static int mount_usage(FILE *stream)
-{
- int rc;
-
- if (strcmp(thisprogram, "mount.smb2") == 0)
- rc = mount_smb2_usage(stream);
- else
- rc = mount_cifs_usage(stream);
-
- return rc;
-}
-
/*
* CIFS has to "escape" commas in the password field so that they don't
* end up getting confused for option delimiters. Copy password into pw
@@ -1928,7 +1881,6 @@ int main(int argc, char **argv)
size_t options_size = MAX_OPTIONS_LEN;
struct parsed_mount_info *parsed_info = NULL;
pid_t pid;
- const char *fstype;
rc = check_setuid();
if (rc)
@@ -2109,14 +2061,9 @@ mount_retry:
if (rc)
goto mount_exit;
- if (strcmp(thisprogram, "mount.smb2") == 0)
- fstype = smb2_fstype;
- else
- fstype = cifs_fstype;
-
if (!parsed_info->fakemnt) {
toggle_dac_capability(0, 1);
- rc = mount(orig_dev, ".", fstype, parsed_info->flags, options);
+ rc = mount(orig_dev, ".", cifs_fstype, parsed_info->flags, options);
toggle_dac_capability(0, 0);
if (rc == 0)
goto do_mtab;
@@ -2133,7 +2080,7 @@ mount_retry:
goto mount_retry;
case ENODEV:
fprintf(stderr,
- "mount error: %s filesystem not supported by the system\n", fstype);
+ "mount error: %s filesystem not supported by the system\n", cifs_fstype);
break;
case ENXIO:
if (!already_uppercased &&
@@ -2163,7 +2110,7 @@ do_mtab:
goto mount_exit;
}
- rc = add_mtab(orig_dev, mountpoint, parsed_info->flags, fstype);
+ rc = add_mtab(orig_dev, mountpoint, parsed_info->flags, cifs_fstype);
}
mount_exit:

40
krb5_auth_con_set_req_cksumtype-implicit-declaration.diff
View File

@ -1,40 +0,0 @@
Author: Lars Mueller <lmuelle@suse.com>
Subject: cifs-utils build breaks with krb5 < 1.7
Bugzilla: na
Inspiration: https://bugzilla.samba.org/show_bug.cgi?id=6918
Upstream-Reported: http://permalink.gmane.org/gmane.linux.kernel.cifs/5932
Upstream-Acknowledged: Yes
Index: cifs-utils-5.4/configure.ac
===================================================================
--- cifs-utils-5.4.orig/configure.ac
+++ cifs-utils-5.4/configure.ac
@@ -178,6 +178,9 @@ if test $enable_cifsupcall != "no"; then
AC_CHECK_FUNCS([krb5_auth_con_setaddrs krb5_auth_con_set_req_cksumtype])
fi
+# MIT krb5 < 1.7 does not have this declaration but does have the symbol
+AC_CHECK_DECLS(krb5_auth_con_set_req_cksumtype, [], [], [#include <krb5.h>])
+
LIBS=$cu_saved_libs
AM_CONDITIONAL(CONFIG_CIFSUPCALL, [test "$enable_cifsupcall" != "no"])
Index: cifs-utils-5.4/cifs.upcall.c
===================================================================
--- cifs-utils-5.4.orig/cifs.upcall.c
+++ cifs-utils-5.4/cifs.upcall.c
@@ -415,6 +415,14 @@ cifs_krb5_get_req(const char *host, cons
*/
in_data.data = discard_const_p(char, gss_cksum);
in_data.length = 24;
+
+ /* MIT krb5 < 1.7 is missing the prototype, but still has the symbol */
+#if !HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE
+ krb5_error_code krb5_auth_con_set_req_cksumtype(
+ krb5_context context,
+ krb5_auth_context auth_context,
+ krb5_cksumtype cksumtype);
+#endif
ret = krb5_auth_con_set_req_cksumtype(context, auth_context, 0x8003);
if (ret) {
syslog(LOG_DEBUG, "%s: unable to set 0x8003 checksum",

24
mount.cifs-toggle_dac_capability-remove-check.diff
View File

@ -1,24 +0,0 @@
I'm not sure what I was thinking when I added that check in, but it's
been there since the inception. We shouldn't care at all what the
real uid is when we call toggle_dac_capability and indeed we don't
care with the libcap-ng version. Remove that check.
Signed-off-by: Jeff Layton <jlayton@samba.org>
---
mount.cifs.c | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
Index: cifs-utils-5.4/mount.cifs.c
===================================================================
--- cifs-utils-5.4.orig/mount.cifs.c
+++ cifs-utils-5.4/mount.cifs.c
@@ -552,9 +552,6 @@ toggle_dac_capability(int writable, int
cap_t caps;
cap_value_t capability = writable ? CAP_DAC_OVERRIDE : CAP_DAC_READ_SEARCH;
- if (getuid() != 0)
- return 0;
-
caps = cap_get_proc();
if (caps == NULL) {
fprintf(stderr, "Unable to get current capability set: %s\n",

19
mount.cifs-toggle_dac_capability-return-stored-returncode.diff
View File

@ -1,19 +0,0 @@
Author: Lars Mueller <lmuelle@suse.com>
Subject: cifs-utils don't make use of stored return code
Bugzilla: na
Upstream-Reported: http://permalink.gmane.org/gmane.linux.kernel.cifs/5935
Upstream-Acknowledged: Yes
Index: cifs-utils-5.4/mount.cifs.c
===================================================================
--- cifs-utils-5.4.orig/mount.cifs.c
+++ cifs-utils-5.4/mount.cifs.c
@@ -577,7 +577,7 @@ toggle_dac_capability(int writable, int
}
free_caps:
cap_free(caps);
- return 0;
+ return rc;
}
#else /* HAVE_LIBCAP */
static int