From 70dccd1468d0a5de123bfa600e7602648e6d2cc1 Mon Sep 17 00:00:00 2001 From: Steve French Date: Tue, 5 Aug 2008 13:15:46 -0500 Subject: [PATCH] Backing out most of changeset 5222b8db3fb692e5071bfd1b41849a8eb0a17995 (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 92fad0fc537e75c726d5d6794dd0c4fd61edca2d) --- source3/client/mount.cifs.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/source3/client/mount.cifs.c b/source3/client/mount.cifs.c index 72ef9febe0a..c7009e306c0 100644 --- a/source3/client/mount.cifs.c +++ b/source3/client/mount.cifs.c @@ -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; */