#include "conn.h"
#include "xcommon.h"
#include "mount.h"
-#include "nfsumount.h"
#include "nfs_mount.h"
#include "mount_constants.h"
#include "nls.h"
char *secflavor = opteq+1;
/* see RFC 2623 */
if (nfs_mount_data_version < 5) {
- printf(_("Warning: ignoring sec=%s option\n"), secflavor);
+ printf(_("Warning: ignoring sec=%s option\n"),
+ secflavor);
continue;
} else if (!strcmp(secflavor, "none"))
data->pseudoflavor = AUTH_NONE;
int ctxlen = strlen(context);
if (ctxlen > NFS_MAX_CONTEXT_LEN) {
- printf(_("context parameter exceeds limit of %d\n"),
- NFS_MAX_CONTEXT_LEN);
+ nfs_error(_("context parameter exceeds"
+ " limit of %d"),
+ NFS_MAX_CONTEXT_LEN);
goto bad_parameter;
}
/* The context string is in the format of
bad_option:
if (sloppy)
continue;
- printf(_("Unsupported nfs mount option: "
- "%s%s\n"), val ? "" : "no", opt);
+ nfs_error(_("%s: Unsupported nfs mount option:"
+ " %s%s"), progname,
+ val ? "" : "no", opt);
goto out_bad;
}
sprintf(cbuf, val ? "%s,":"no%s,", opt);
}
len += strlen(cbuf);
if (len >= opt_size) {
- printf(_("mount: excessively long option argument\n"));
+ nfs_error(_("%s: excessively long option argument"),
+ progname);
goto out_bad;
}
strcat(new_opts, cbuf);
}
return 1;
bad_parameter:
- printf(_("Bad nfs mount parameter: %s\n"), opt);
+ nfs_error(_("%s: Bad nfs mount parameter: %s\n"), progname, opt);
out_bad:
return 0;
}