sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

Backing out most of changeset 5222b8db3f

Browse Source 
(so parsing for domain parameter in mount.cifs matches online help)
and rephrasing original code to make it more clear.

The check for "domain" was meant to allow for "dom" or "DOM" and the
option ("dom") described in the help (e.g. "/sbin/mount.cifs -?") is the
shorter ("dom") form.  The reason that the string we compare against
is larger was to improve readability (we could compare against "dom"
but note /* "domain" or "DOMAIN" or "dom" or "DOM" */ but it seemed
terser to just show the larger string in the strcmp target.   The
change to "workgoup" from workg* (anything which begins with "workg"
doesn't matter - it is a minor behavior change - but probably few
scripts depend on the "alias" for this option).

Rework code so that it is clearer what we are comparing against.
(This used to be commit 92fad0fc53)
This commit is contained in:
Steve French 2008-08-05 13:15:46 -05:00
parent 500038e485
commit 70dccd1468
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source3/client/mount.cifs.c
View File

@ -517,8 +517,11 @@ static int parse_options(char ** optionsp, int * filesys_flags)
printf("CIFS: UNC name too long\n");
return 1;
}
} else if ((strncmp(data, "domain", 6) == 0)
|| (strncmp(data, "workgroup", 9) == 0)) {
} else if ((strncmp(data, "dom" /* domain */, 3) == 0)
|| (strncmp(data, "workg", 5) == 0)) {
/* note this allows for synonyms of "domain"
such as "DOM" and "dom" and "workgroup"
and "WORKGRP" etc. */
if (!value || !*value) {
printf("CIFS: invalid domain name\n");
return 1; /* needs_arg; */