← Back to branch summary

~ubuntu-branches/debian/stretch/nfs-utils/stretch

« back to all changes in this revision

Viewing changes to support/nfs/exports.c

  • Committer: Bazaar Package Importer
  • Author(s): Luk Claes
  • Date: 2011-07-09 16:28:32 UTC
  • mfrom: (1.2.20 upstream)
  • Revision ID: james.westby@ubuntu.com-20110709162832-ovaehe77pm3hyy35
Tags: 1:1.2.4-1
http://bugs.debian.org/633155
http://bugs.debian.org/619877
http://bugs.debian.org/626478
* New upstream version
  - Fix host_reliable_addrinfo (Closes: #633155)
  - Allow multiple RPC listeners to share listener port number
  (Closes: #619877)
  - Add --enable-libmount-mount (Closes: #626478)
  - 12-svcgssd-document-n-option.patch applied upstream
  - Refresh 19-exports.man-Fix-comment-syntax.patch
  - 21-anticipate-RLIMIT_FSIZE.patch applied upstream
  - Add nfsidmap binary and manpage
  - Use autoreconf to avoid build failure

Show diffs side-by-side

added added

removed removed

Lines of Context:
support/nfs/exports.c
107
107
        ee->e_nsquids = 0;
108
108
        ee->e_nsqgids = 0;
109
109
        ee->e_uuid = NULL;
 
110
        ee->e_ttl = DEFAULT_TTL;
110
111
}
111
112
 
112
113
struct exportent *
141
142
                return NULL;
142
143
        }
143
144
        first = 0;
144
 
                
145
 
        /* Check for default options */
146
 
        if (exp[0] == '-') {
 
145
 
 
146
        /*
 
147
         * Check for default options.  The kernel will never have default
 
148
         * options in /proc/fs/nfs/exports, however due to the initial '-' in
 
149
         * the -test-client- string from the test export we have to check that
 
150
         * we're not reading from the kernel.
 
151
         */
 
152
        if (exp[0] == '-' && !fromkernel) {
147
153
                if (parseopts(exp + 1, &def_ee, 0, &has_default_subtree_opts) < 0)
148
154
                        return NULL;
149
155
                
332
338
                dst->e_mountpoint = strdup(src->e_mountpoint);
333
339
        if (src->e_fslocdata)
334
340
                dst->e_fslocdata = strdup(src->e_fslocdata);
 
341
        if (src->e_uuid)
 
342
                dst->e_uuid = strdup(src->e_uuid);
335
343
        dst->e_hostname = NULL;
336
344
}
337
345