X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fnfs4mount.c;h=8f95ab735966ebe10b2d70cdde6af45a07ffefa4;hp=cc6eaf254719678822a811d468a71927e227fb1b;hb=2f1ade1adf8074efbd661d41758d8844ab5f522e;hpb=28e4224b9bbfc355c83e17df74c47221afacd560 diff --git a/utils/mount/nfs4mount.c b/utils/mount/nfs4mount.c index cc6eaf2..8f95ab7 100644 --- a/utils/mount/nfs4mount.c +++ b/utils/mount/nfs4mount.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -38,12 +39,13 @@ #include "pseudoflavors.h" #include "nls.h" -#include "conn.h" #include "xcommon.h" +#include "mount_constants.h" #include "nfs4_mount.h" #include "nfs_mount.h" #include "error.h" +#include "network.h" #if defined(VAR_LOCK_DIR) #define DEFAULT_DIR VAR_LOCK_DIR @@ -51,6 +53,7 @@ #define DEFAULT_DIR "/var/lock/subsys" #endif +extern char *progname; extern int verbose; extern int sloppy; @@ -67,7 +70,7 @@ char *GSSDLCK = DEFAULT_DIR "/rpcgssd"; if (access(GSSDLCK, F_OK)) { \ printf(_("Warning: rpc.gssd appears not to be running.\n")); \ } \ -} while(0); +} while(0); #ifndef NFS_PORT #define NFS_PORT 2049 @@ -81,9 +84,8 @@ static int parse_sec(char *sec, int *pseudoflavour) for (sec = strtok(sec, ":"); sec; sec = strtok(NULL, ":")) { if (num_flavour >= MAX_USER_FLAVOUR) { - fprintf(stderr, - _("mount: maximum number of security flavors " - "exceeded\n")); + nfs_error(_("%s: maximum number of security flavors " + "exceeded"), progname); return 0; } for (i = 0; i < flav_map_size; i++) { @@ -93,14 +95,14 @@ static int parse_sec(char *sec, int *pseudoflavour) } } if (i == flav_map_size) { - fprintf(stderr, - _("mount: unknown security type %s\n"), sec); + nfs_error(_("%s: unknown security type %s\n"), + progname, sec); return 0; } } if (!num_flavour) - fprintf(stderr, - _("mount: no security flavors passed to sec= option\n")); + nfs_error(_("%s: no security flavors passed to sec= option"), + progname); return num_flavour; } @@ -109,9 +111,8 @@ static int parse_devname(char *hostdir, char **hostname, char **dirname) char *s; if (!(s = strchr(hostdir, ':'))) { - fprintf(stderr, - _("mount: " - "directory to mount not in host:dir format\n")); + nfs_error(_("%s: directory to mount not in host:dir format"), + progname); return -1; } *hostname = hostdir; @@ -121,9 +122,8 @@ static int parse_devname(char *hostdir, char **hostname, char **dirname) until they can be fully supported. (mack@sgi.com) */ if ((s = strchr(hostdir, ','))) { *s = '\0'; - fprintf(stderr, - _("mount: warning: " - "multiple hostnames not supported\n")); + nfs_error(_("%s: warning: multiple hostnames not supported"), + progname); } return 0; } @@ -136,13 +136,12 @@ static int fill_ipv4_sockaddr(const char *hostname, struct sockaddr_in *addr) if (inet_aton(hostname, &addr->sin_addr)) return 0; if ((hp = gethostbyname(hostname)) == NULL) { - fprintf(stderr, _("mount: can't get address for %s\n"), - hostname); + nfs_error(_("%s: can't get address for %s\n"), + progname, hostname); return -1; } if (hp->h_length > sizeof(struct in_addr)) { - fprintf(stderr, - _("mount: got bad hp->h_length\n")); + nfs_error(_("%s: got bad hp->h_length"), progname); hp->h_length = sizeof(struct in_addr); } memcpy(&addr->sin_addr, hp->h_addr, hp->h_length); @@ -155,7 +154,8 @@ static int get_my_ipv4addr(char *ip_addr, int len) struct sockaddr_in myaddr; if (gethostname(myname, sizeof(myname))) { - fprintf(stderr, _("mount: can't determine client address\n")); + nfs_error(_("%s: can't determine client address\n"), + progname); return -1; } if (fill_ipv4_sockaddr(myname, &myaddr)) @@ -165,9 +165,8 @@ static int get_my_ipv4addr(char *ip_addr, int len) return 0; } -int nfs4mount(const char *spec, const char *node, int *flags, - char **extra_opts, char **mount_opts, - int running_bg) +int nfs4mount(const char *spec, const char *node, int flags, + char **extra_opts, int fake) { static struct nfs4_mount_data data; static char hostdir[1024]; @@ -190,8 +189,8 @@ int nfs4mount(const char *spec, const char *node, int *flags, retval = EX_FAIL; if (strlen(spec) >= sizeof(hostdir)) { - fprintf(stderr, _("mount: " - "excessively long host:dir argument\n")); + nfs_error(_("%s: excessively long host:dir argument\n"), + progname); goto fail; } strcpy(hostdir, spec); @@ -209,8 +208,8 @@ int nfs4mount(const char *spec, const char *node, int *flags, if (!old_opts) old_opts = ""; if (strlen(old_opts) + strlen(s) + 10 >= sizeof(new_opts)) { - fprintf(stderr, _("mount: " - "excessively long option argument\n")); + nfs_error(_("%s: excessively long option argument\n"), + progname); goto fail; } snprintf(new_opts, sizeof(new_opts), "%s%saddr=%s", @@ -305,9 +304,9 @@ int nfs4mount(const char *spec, const char *node, int *flags, val = 0; opt += 2; } - if (!strcmp(opt, "bg")) + if (!strcmp(opt, "bg")) bg = val; - else if (!strcmp(opt, "fg")) + else if (!strcmp(opt, "fg")) bg = !val; else if (!strcmp(opt, "soft")) soft = val; @@ -322,8 +321,8 @@ int nfs4mount(const char *spec, const char *node, int *flags, else if (!strcmp(opt, "sharecache")) unshared = !val; else if (!sloppy) { - printf(_("unknown nfs mount option: " - "%s%s\n"), val ? "" : "no", opt); + printf(_("unknown nfs mount option: %s%s\n"), + val ? "" : "no", opt); goto fail; } } @@ -368,14 +367,14 @@ int nfs4mount(const char *spec, const char *node, int *flags, data.host_addrlen = sizeof(server_addr); #ifdef NFS_MOUNT_DEBUG - printf("rsize = %d, wsize = %d, timeo = %d, retrans = %d\n", + printf(_("rsize = %d, wsize = %d, timeo = %d, retrans = %d\n"), data.rsize, data.wsize, data.timeo, data.retrans); - printf("acreg (min, max) = (%d, %d), acdir (min, max) = (%d, %d)\n", + printf(_("acreg (min, max) = (%d, %d), acdir (min, max) = (%d, %d)\n"), data.acregmin, data.acregmax, data.acdirmin, data.acdirmax); - printf("port = %d, bg = %d, retry = %d, flags = %.8x\n", + printf(_("port = %d, bg = %d, retry = %d, flags = %.8x\n"), ntohs(server_addr.sin_port), bg, retry, data.flags); - printf("soft = %d, intr = %d, nocto = %d, noac = %d, " - "nosharecache = %d\n", + printf(_("soft = %d, intr = %d, nocto = %d, noac = %d, " + "nosharecache = %d\n"), (data.flags & NFS4_MOUNT_SOFT) != 0, (data.flags & NFS4_MOUNT_INTR) != 0, (data.flags & NFS4_MOUNT_NOCTO) != 0, @@ -385,7 +384,7 @@ int nfs4mount(const char *spec, const char *node, int *flags, if (num_flavour > 0) { int pf_cnt, i; - printf("sec = "); + printf(_("sec = ")); for (pf_cnt = 0; pf_cnt < num_flavour; pf_cnt++) { for (i = 0; i < flav_map_size; i++) { if (flav_map[i].fnum == pseudoflavour[pf_cnt]) { @@ -396,16 +395,16 @@ int nfs4mount(const char *spec, const char *node, int *flags, printf("%s", (pf_cnt < num_flavour-1) ? ":" : "\n"); } } - printf("proto = %s\n", (data.proto == IPPROTO_TCP) ? "tcp" : "udp"); + printf(_("proto = %s\n"), (data.proto == IPPROTO_TCP) ? _("tcp") : _("udp")); #endif timeout = time(NULL) + 60 * retry; data.version = NFS4_MOUNT_VERSION; for (;;) { if (verbose) { - fprintf(stderr, - "mount: pinging: prog %d vers %d prot %s port %d\n", - NFS_PROGRAM, 4, data.proto == IPPROTO_UDP ? "udp" : "tcp", + printf(_("%s: pinging: prog %d vers %d prot %s port %d\n"), + progname, NFS_PROGRAM, 4, + data.proto == IPPROTO_UDP ? "udp" : "tcp", ntohs(server_addr.sin_port)); } client_addr.sin_family = 0; @@ -441,8 +440,14 @@ int nfs4mount(const char *spec, const char *node, int *flags, continue; } - *mount_opts = (char *) &data; - /* clean up */ + if (!fake) { + if (mount(spec, node, "nfs4", + flags & ~(MS_USER|MS_USERS), &data)) { + mount_error(spec, node, errno); + goto fail; + } + } + return 0; fail: