On Sun, 25 Sep 2011 10:06:25 -0500
shirishpargaonkar@xxxxxxxxx wrote:
> From: Shirish Pargaonkar <shirishpargaonkar@xxxxxxxxx>
>
>
> Add mount options backupuid and backugid and their manpage contents.
> Check for either a valid uid/gid or valid user/group name.
>
>
> Signed-off-by: Shirish Pargaonkar <shirishpargaonkar@xxxxxxxxx>
> ---
> mount.cifs.8 | 14 +++++++++
> mount.cifs.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
> 2 files changed, 96 insertions(+), 8 deletions(-)
>
> diff --git a/mount.cifs.8 b/mount.cifs.8
> index 81ebdbe..40e6ee1 100644
> --- a/mount.cifs.8
> +++ b/mount.cifs.8
> @@ -282,6 +282,20 @@ See sections on
> for more information\&.
> .RE
> .PP
> +backupuid
> +.RS 4
> +Allow access to files with the intent to back them up for a user\&.
> +.sp
> +This option restricts to an user, specified either as an uid or a user name, as an authenticated user at the server, access to files with the intent to back them up including their ACLs, who otherwise may not have access permissions but has "Backup files and directories user right" on them (e.g. by virtue of that authenticated user being part of the built-in group Backup Operators at the server).
> +.RE
> +.PP
> +backupgid
> +.RS 4
> +Allow access to files with the intent to back them up for a group\&.
> +.sp
> +This option restricts to an user in a group, specified either as a gid or a group name, as an authenticated user at the server, access to files with the intent to back them up including their ACLs, who otherwise may not have access permissions but has "Backup files and directories user right" on them (e.g. by virtue of that authenticated user being part of the built-in group Backup Operators at the server).
> +.RE
> +.PP
Holy run on sentences, Batman.
Can you rephrase the above descriptions to be a little less awkward.
It's really ok to use more than one sentence.
> nocase
> .RS 4
> Request case insensitive path name matching (case sensitive is the default if the server suports it)\&.
> diff --git a/mount.cifs.c b/mount.cifs.c
> index 1e3d534..3edc164 100644
> --- a/mount.cifs.c
> +++ b/mount.cifs.c
> @@ -158,6 +158,8 @@
> #define OPT_MAND 27
> #define OPT_NOMAND 28
> #define OPT_CRUID 29
> +#define OPT_BKUPUID 30
> +#define OPT_BKUPGID 31
>
>
> /* struct for holding parsed mount info for use by privleged process */
> @@ -843,6 +845,10 @@ static int parse_opt_token(const char *token)
> return OPT_REMOUNT;
> if (strncmp(token, "_netdev", 7) == 0)
> return OPT_IGNORE;
> + if (strncmp(token, "backupuid", 9) == 0)
> + return OPT_BKUPUID;
> + if (strncmp(token, "backupgid", 9) == 0)
> + return OPT_BKUPGID;
>
> return OPT_ERROR;
> }
> @@ -858,11 +864,13 @@ parse_options(const char *data, struct parsed_mount_info *parsed_info)
> int out_len = 0;
> int word_len;
> int rc = 0;
> + int got_bkupuid = 0;
> + int got_bkupgid = 0;
> int got_uid = 0;
> int got_cruid = 0;
> int got_gid = 0;
> - uid_t uid, cruid = 0;
> - gid_t gid;
> + uid_t uid, cruid = 0, bkupuid;
> + gid_t gid, bkupgid;
> char *ep;
> struct passwd *pw;
> struct group *gr;
> @@ -1031,9 +1039,8 @@ parse_options(const char *data, struct parsed_mount_info *parsed_info)
> goto nocopy;
>
> got_uid = 1;
> - errno = 0;
> uid = strtoul(value, &ep, 10);
> - if (errno == 0)
> + if (!strlen(ep))
> goto nocopy;
>
NAK: you just broke the above code. Please read the strtoul(3) manpage.
> pw = getpwnam(value);
> @@ -1050,9 +1057,8 @@ parse_options(const char *data, struct parsed_mount_info *parsed_info)
> goto nocopy;
>
> got_cruid = 1;
> - errno = 0;
> cruid = strtoul(value, &ep, 10);
> - if (errno == 0)
> + if (!strlen(ep))
> goto nocopy;
>
> pw = getpwnam(value);
> @@ -1068,9 +1074,8 @@ parse_options(const char *data, struct parsed_mount_info *parsed_info)
> goto nocopy;
>
> got_gid = 1;
> - errno = 0;
> gid = strtoul(value, &ep, 10);
> - if (errno == 0)
> + if (!strlen(ep))
> goto nocopy;
>
> gr = getgrnam(value);
> @@ -1171,6 +1176,42 @@ parse_options(const char *data, struct parsed_mount_info *parsed_info)
> break;
> case OPT_IGNORE:
> goto nocopy;
> + case OPT_BKUPUID:
> + if (!value || !*value)
> + goto nocopy;
> +
> + got_bkupuid = 1;
> + bkupuid = strtoul(value, &ep, 10);
> + if (!strlen(ep))
> + goto nocopy;
> +
> + pw = getpwnam(value);
> + if (pw == NULL) {
> + fprintf(stderr,
> + "bad user name \"%s\"\n", value);
> + return EX_USAGE;
> + }
> +
> + bkupuid = pw->pw_uid;
> + goto nocopy;
> + case OPT_BKUPGID:
> + if (!value || !*value)
> + goto nocopy;
> +
> + got_bkupgid = 1;
> + bkupgid = strtoul(value, &ep, 10);
> + if (!strlen(ep))
> + goto nocopy;
> +
> + gr = getgrnam(value);
> + if (gr == NULL) {
> + fprintf(stderr,
> + "bad group name \"%s\"\n", value);
> + return EX_USAGE;
> + }
> +
> + bkupgid = gr->gr_gid;
> + goto nocopy;
> }
>
> /* check size before copying option to buffer */
> @@ -1246,6 +1287,39 @@ nocopy:
> }
> snprintf(out + out_len, word_len + 5, "gid=%s", txtbuf);
> }
> + /* special-case the uid and gid */
> + if (got_bkupuid) {
> + word_len = snprintf(txtbuf, sizeof(txtbuf), "%u", bkupuid);
> +
> + /* comma + "uid=" + terminating NULL == 6 */
> + if (out_len + word_len + 6 > MAX_OPTIONS_LEN) {
> + fprintf(stderr, "Options string too long\n");
> + return EX_USAGE;
> + }
> +
> + if (out_len) {
> + strlcat(out, ",", MAX_OPTIONS_LEN);
> + out_len++;
> + }
> + snprintf(out + out_len, word_len + 11, "backupuid=%s", txtbuf);
> + out_len = strlen(out);
> + }
> + if (got_bkupgid) {
> + word_len = snprintf(txtbuf, sizeof(txtbuf), "%u", bkupgid);
> +
> + /* comma + "backkupgid=" + terminating NULL == 6 */
> + if (out_len + word_len + 6 > MAX_OPTIONS_LEN) {
> + fprintf(stderr, "Options string too long\n");
> + return EX_USAGE;
> + }
> +
> + if (out_len) {
> + strlcat(out, ",", MAX_OPTIONS_LEN);
> + out_len++;
> + }
> + snprintf(out + out_len, word_len + 11, "backupgid=%s", txtbuf);
> + }
> +
> return 0;
> }
>
--
Jeff Layton <jlayton@xxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
