Initial import of files from samba master branch
authorJeff Layton <jlayton@redhat.com>
Sun, 7 Feb 2010 12:40:12 +0000 (07:40 -0500)
committerJeff Layton <jlayton@redhat.com>
Sun, 7 Feb 2010 12:40:12 +0000 (07:40 -0500)
(commit 6e510b49c03be9caba4f587f3f6cec547841b0d7)

cifs.upcall.c [new file with mode: 0644]
cifs_spnego.h [new file with mode: 0644]
mount.cifs.c [new file with mode: 0644]
mount.h [new file with mode: 0644]
mtab.c [new file with mode: 0644]

diff --git a/cifs.upcall.c b/cifs.upcall.c
new file mode 100644 (file)
index 0000000..bfc70d1
--- /dev/null
@@ -0,0 +1,653 @@
+/*
+* CIFS user-space helper.
+* Copyright (C) Igor Mammedov (niallain@gmail.com) 2007
+* Copyright (C) Jeff Layton (jlayton@redhat.com) 2009
+*
+* Used by /sbin/request-key for handling
+* cifs upcall for kerberos authorization of access to share and
+* cifs upcall for DFS srver name resolving (IPv4/IPv6 aware).
+* You should have keyutils installed and add something like the
+* following lines to /etc/request-key.conf file:
+
+create cifs.spnego * * /usr/local/sbin/cifs.upcall %k
+create dns_resolver * * /usr/local/sbin/cifs.upcall %k
+
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+#include "includes.h"
+#include "../libcli/auth/spnego.h"
+#include "smb_krb5.h"
+#include <keyutils.h>
+#include <getopt.h>
+
+#include "cifs_spnego.h"
+
+#define        CIFS_DEFAULT_KRB5_DIR           "/tmp"
+#define        CIFS_DEFAULT_KRB5_PREFIX        "krb5cc_"
+
+#define        MAX_CCNAME_LEN                  PATH_MAX + 5
+
+const char *CIFSSPNEGO_VERSION = "1.3";
+static const char *prog = "cifs.upcall";
+typedef enum _sectype {
+       NONE = 0,
+       KRB5,
+       MS_KRB5
+} sectype_t;
+
+/* does the ccache have a valid TGT? */
+static time_t
+get_tgt_time(const char *ccname) {
+       krb5_context context;
+       krb5_ccache ccache;
+       krb5_cc_cursor cur;
+       krb5_creds creds;
+       krb5_principal principal;
+       time_t credtime = 0;
+       char *realm = NULL;
+
+       if (krb5_init_context(&context)) {
+               syslog(LOG_DEBUG, "%s: unable to init krb5 context", __func__);
+               return 0;
+       }
+
+       if (krb5_cc_resolve(context, ccname, &ccache)) {
+               syslog(LOG_DEBUG, "%s: unable to resolve krb5 cache", __func__);
+               goto err_cache;
+       }
+
+       if (krb5_cc_set_flags(context, ccache, 0)) {
+               syslog(LOG_DEBUG, "%s: unable to set flags", __func__);
+               goto err_cache;
+       }
+
+       if (krb5_cc_get_principal(context, ccache, &principal)) {
+               syslog(LOG_DEBUG, "%s: unable to get principal", __func__);
+               goto err_princ;
+       }
+
+       if (krb5_cc_start_seq_get(context, ccache, &cur)) {
+               syslog(LOG_DEBUG, "%s: unable to seq start", __func__);
+               goto err_ccstart;
+       }
+
+       if ((realm = smb_krb5_principal_get_realm(context, principal)) == NULL) {
+               syslog(LOG_DEBUG, "%s: unable to get realm", __func__);
+               goto err_ccstart;
+       }
+
+       while (!credtime && !krb5_cc_next_cred(context, ccache, &cur, &creds)) {
+               char *name;
+               if (smb_krb5_unparse_name(NULL, context, creds.server, &name)) {
+                       syslog(LOG_DEBUG, "%s: unable to unparse name", __func__);
+                       goto err_endseq;
+               }
+               if (krb5_realm_compare(context, creds.server, principal) &&
+                   strnequal(name, KRB5_TGS_NAME, KRB5_TGS_NAME_SIZE) &&
+                   strnequal(name+KRB5_TGS_NAME_SIZE+1, realm, strlen(realm)) &&
+                   creds.times.endtime > time(NULL))
+                       credtime = creds.times.endtime;
+                krb5_free_cred_contents(context, &creds);
+               TALLOC_FREE(name);
+        }
+err_endseq:
+        krb5_cc_end_seq_get(context, ccache, &cur);
+err_ccstart:
+       krb5_free_principal(context, principal);
+err_princ:
+#if defined(KRB5_TC_OPENCLOSE)
+       krb5_cc_set_flags(context, ccache, KRB5_TC_OPENCLOSE);
+#endif
+       krb5_cc_close(context, ccache);
+err_cache:
+       krb5_free_context(context);
+       return credtime;
+}
+
+static int
+krb5cc_filter(const struct dirent *dirent)
+{
+       if (strstr(dirent->d_name, CIFS_DEFAULT_KRB5_PREFIX))
+               return 1;
+       else
+               return 0;
+}
+
+/* search for a credcache that looks like a likely candidate */
+static char *
+find_krb5_cc(const char *dirname, uid_t uid)
+{
+       struct dirent **namelist;
+       struct stat sbuf;
+       char ccname[MAX_CCNAME_LEN], *credpath, *best_cache = NULL;
+       int i, n;
+       time_t cred_time, best_time = 0;
+
+       n = scandir(dirname, &namelist, krb5cc_filter, NULL);
+       if (n < 0) {
+               syslog(LOG_DEBUG, "%s: scandir error on directory '%s': %s",
+                                 __func__, dirname, strerror(errno));
+               return NULL;
+       }
+
+       for (i = 0; i < n; i++) {
+               snprintf(ccname, sizeof(ccname), "FILE:%s/%s", dirname,
+                        namelist[i]->d_name);
+               credpath = ccname + 5;
+               syslog(LOG_DEBUG, "%s: considering %s", __func__, credpath);
+
+               if (lstat(credpath, &sbuf)) {
+                       syslog(LOG_DEBUG, "%s: stat error on '%s': %s",
+                                         __func__, credpath, strerror(errno));
+                       free(namelist[i]);
+                       continue;
+               }
+               if (sbuf.st_uid != uid) {
+                       syslog(LOG_DEBUG, "%s: %s is owned by %u, not %u",
+                                       __func__, credpath, sbuf.st_uid, uid);
+                       free(namelist[i]);
+                       continue;
+               }
+               if (!S_ISREG(sbuf.st_mode)) {
+                       syslog(LOG_DEBUG, "%s: %s is not a regular file",
+                                       __func__, credpath);
+                       free(namelist[i]);
+                       continue;
+               }
+               if (!(cred_time = get_tgt_time(ccname))) {
+                       syslog(LOG_DEBUG, "%s: %s is not a valid credcache.",
+                                       __func__, ccname);
+                       free(namelist[i]);
+                       continue;
+               }
+
+               if (cred_time <= best_time) {
+                       syslog(LOG_DEBUG, "%s: %s expires sooner than current "
+                                         "best.", __func__, ccname);
+                       free(namelist[i]);
+                       continue;
+               }
+
+               syslog(LOG_DEBUG, "%s: %s is valid ccache", __func__, ccname);
+               free(best_cache);
+               best_cache = SMB_STRNDUP(ccname, MAX_CCNAME_LEN);
+               best_time = cred_time;
+               free(namelist[i]);
+       }
+       free(namelist);
+
+       return best_cache;
+}
+
+/*
+ * Prepares AP-REQ data for mechToken and gets session key
+ * Uses credentials from cache. It will not ask for password
+ * you should receive credentials for yuor name manually using
+ * kinit or whatever you wish.
+ *
+ * in:
+ *     oid -           string with OID/ Could be OID_KERBEROS5
+ *                     or OID_KERBEROS5_OLD
+ *     principal -     Service name.
+ *                     Could be "cifs/FQDN" for KRB5 OID
+ *                     or for MS_KRB5 OID style server principal
+ *                     like "pdc$@YOUR.REALM.NAME"
+ *
+ * out:
+ *     secblob -       pointer for spnego wrapped AP-REQ data to be stored
+ *     sess_key-       pointer for SessionKey data to be stored
+ *
+ * ret: 0 - success, others - failure
+ */
+static int
+handle_krb5_mech(const char *oid, const char *principal, DATA_BLOB *secblob,
+                DATA_BLOB *sess_key, const char *ccname)
+{
+       int retval;
+       DATA_BLOB tkt, tkt_wrapped;
+
+       syslog(LOG_DEBUG, "%s: getting service ticket for %s", __func__,
+                         principal);
+
+       /* get a kerberos ticket for the service and extract the session key */
+       retval = cli_krb5_get_ticket(principal, 0, &tkt, sess_key, 0, ccname,
+                                    NULL, NULL);
+
+       if (retval) {
+               syslog(LOG_DEBUG, "%s: failed to obtain service ticket (%d)",
+                                 __func__, retval);
+               return retval;
+       }
+
+       syslog(LOG_DEBUG, "%s: obtained service ticket", __func__);
+
+       /* wrap that up in a nice GSS-API wrapping */
+       tkt_wrapped = spnego_gen_krb5_wrap(tkt, TOK_ID_KRB_AP_REQ);
+
+       /* and wrap that in a shiny SPNEGO wrapper */
+       *secblob = gen_negTokenInit(oid, tkt_wrapped);
+
+       data_blob_free(&tkt_wrapped);
+       data_blob_free(&tkt);
+       return retval;
+}
+
+#define DKD_HAVE_HOSTNAME      0x1
+#define DKD_HAVE_VERSION       0x2
+#define DKD_HAVE_SEC           0x4
+#define DKD_HAVE_IP            0x8
+#define DKD_HAVE_UID           0x10
+#define DKD_HAVE_PID           0x20
+#define DKD_MUSTHAVE_SET (DKD_HAVE_HOSTNAME|DKD_HAVE_VERSION|DKD_HAVE_SEC)
+
+struct decoded_args {
+       int             ver;
+       char            *hostname;
+       char            *ip;
+       uid_t           uid;
+       pid_t           pid;
+       sectype_t       sec;
+};
+
+static unsigned int
+decode_key_description(const char *desc, struct decoded_args *arg)
+{
+       int len;
+       int retval = 0;
+       char *pos;
+       const char *tkn = desc;
+
+       do {
+               pos = index(tkn, ';');
+               if (strncmp(tkn, "host=", 5) == 0) {
+
+                       if (pos == NULL)
+                               len = strlen(tkn);
+                       else
+                               len = pos - tkn;
+
+                       len -= 4;
+                       SAFE_FREE(arg->hostname);
+                       arg->hostname = SMB_XMALLOC_ARRAY(char, len);
+                       strlcpy(arg->hostname, tkn + 5, len);
+                       retval |= DKD_HAVE_HOSTNAME;
+               } else if (!strncmp(tkn, "ip4=", 4) ||
+                          !strncmp(tkn, "ip6=", 4)) {
+                       if (pos == NULL)
+                               len = strlen(tkn);
+                       else
+                               len = pos - tkn;
+
+                       len -= 3;
+                       SAFE_FREE(arg->ip);
+                       arg->ip = SMB_XMALLOC_ARRAY(char, len);
+                       strlcpy(arg->ip, tkn + 4, len);
+                       retval |= DKD_HAVE_IP;
+               } else if (strncmp(tkn, "pid=", 4) == 0) {
+                       errno = 0;
+                       arg->pid = strtol(tkn + 4, NULL, 0);
+                       if (errno != 0) {
+                               syslog(LOG_ERR, "Invalid pid format: %s",
+                                      strerror(errno));
+                               return 1;
+                       } else {
+                               retval |= DKD_HAVE_PID;
+                       }
+               } else if (strncmp(tkn, "sec=", 4) == 0) {
+                       if (strncmp(tkn + 4, "krb5", 4) == 0) {
+                               retval |= DKD_HAVE_SEC;
+                               arg->sec = KRB5;
+                       } else if (strncmp(tkn + 4, "mskrb5", 6) == 0) {
+                               retval |= DKD_HAVE_SEC;
+                               arg->sec = MS_KRB5;
+                       }
+               } else if (strncmp(tkn, "uid=", 4) == 0) {
+                       errno = 0;
+                       arg->uid = strtol(tkn + 4, NULL, 16);
+                       if (errno != 0) {
+                               syslog(LOG_ERR, "Invalid uid format: %s",
+                                      strerror(errno));
+                               return 1;
+                       } else {
+                               retval |= DKD_HAVE_UID;
+                       }
+               } else if (strncmp(tkn, "ver=", 4) == 0) {      /* if version */
+                       errno = 0;
+                       arg->ver = strtol(tkn + 4, NULL, 16);
+                       if (errno != 0) {
+                               syslog(LOG_ERR, "Invalid version format: %s",
+                                      strerror(errno));
+                               return 1;
+                       } else {
+                               retval |= DKD_HAVE_VERSION;
+                       }
+               }
+               if (pos == NULL)
+                       break;
+               tkn = pos + 1;
+       } while (tkn);
+       return retval;
+}
+
+static int
+cifs_resolver(const key_serial_t key, const char *key_descr)
+{
+       int c;
+       struct addrinfo *addr;
+       char ip[INET6_ADDRSTRLEN];
+       void *p;
+       const char *keyend = key_descr;
+       /* skip next 4 ';' delimiters to get to description */
+       for (c = 1; c <= 4; c++) {
+               keyend = index(keyend+1, ';');
+               if (!keyend) {
+                       syslog(LOG_ERR, "invalid key description: %s",
+                                       key_descr);
+                       return 1;
+               }
+       }
+       keyend++;
+
+       /* resolve name to ip */
+       c = getaddrinfo(keyend, NULL, NULL, &addr);
+       if (c) {
+               syslog(LOG_ERR, "unable to resolve hostname: %s [%s]",
+                               keyend, gai_strerror(c));
+               return 1;
+       }
+
+       /* conver ip to string form */
+       if (addr->ai_family == AF_INET)
+               p = &(((struct sockaddr_in *)addr->ai_addr)->sin_addr);
+       else
+               p = &(((struct sockaddr_in6 *)addr->ai_addr)->sin6_addr);
+
+       if (!inet_ntop(addr->ai_family, p, ip, sizeof(ip))) {
+               syslog(LOG_ERR, "%s: inet_ntop: %s", __func__, strerror(errno));
+               freeaddrinfo(addr);
+               return 1;
+       }
+
+       /* setup key */
+       c = keyctl_instantiate(key, ip, strlen(ip)+1, 0);
+       if (c == -1) {
+               syslog(LOG_ERR, "%s: keyctl_instantiate: %s", __func__,
+                               strerror(errno));
+               freeaddrinfo(addr);
+               return 1;
+       }
+
+       freeaddrinfo(addr);
+       return 0;
+}
+
+/*
+ * Older kernels sent IPv6 addresses without colons. Well, at least
+ * they're fixed-length strings. Convert these addresses to have colon
+ * delimiters to make getaddrinfo happy.
+ */
+static void
+convert_inet6_addr(const char *from, char *to)
+{
+       int i = 1;
+
+       while (*from) {
+               *to++ = *from++;
+               if (!(i++ % 4) && *from)
+                       *to++ = ':';
+       }
+       *to = 0;
+}
+
+static int
+ip_to_fqdn(const char *addrstr, char *host, size_t hostlen)
+{
+       int rc;
+       struct addrinfo hints = { .ai_flags = AI_NUMERICHOST };
+       struct addrinfo *res;
+       const char *ipaddr = addrstr;
+       char converted[INET6_ADDRSTRLEN + 1];
+
+       if ((strlen(ipaddr) > INET_ADDRSTRLEN) && !strchr(ipaddr, ':')) {
+               convert_inet6_addr(ipaddr, converted);
+               ipaddr = converted;
+       }
+
+       rc = getaddrinfo(ipaddr, NULL, &hints, &res);
+       if (rc) {
+               syslog(LOG_DEBUG, "%s: failed to resolve %s to "
+                       "ipaddr: %s", __func__, ipaddr,
+               rc == EAI_SYSTEM ? strerror(errno) : gai_strerror(rc));
+               return rc;
+       }
+
+       rc = getnameinfo(res->ai_addr, res->ai_addrlen, host, hostlen,
+                        NULL, 0, NI_NAMEREQD);
+       freeaddrinfo(res);
+       if (rc) {
+               syslog(LOG_DEBUG, "%s: failed to resolve %s to fqdn: %s",
+                       __func__, ipaddr,
+                       rc == EAI_SYSTEM ? strerror(errno) : gai_strerror(rc));
+               return rc;
+       }
+
+       syslog(LOG_DEBUG, "%s: resolved %s to %s", __func__, ipaddr, host);
+       return 0;
+}
+
+static void
+usage(void)
+{
+       syslog(LOG_INFO, "Usage: %s [-t] [-v] key_serial", prog);
+       fprintf(stderr, "Usage: %s [-t] [-v] key_serial\n", prog);
+}
+
+const struct option long_options[] = {
+       { "trust-dns",  0, NULL, 't' },
+       { "version",    0, NULL, 'v' },
+       { NULL,         0, NULL, 0 }
+};
+
+int main(const int argc, char *const argv[])
+{
+       struct cifs_spnego_msg *keydata = NULL;
+       DATA_BLOB secblob = data_blob_null;
+       DATA_BLOB sess_key = data_blob_null;
+       key_serial_t key = 0;
+       size_t datalen;
+       unsigned int have;
+       long rc = 1;
+       int c, try_dns = 0;
+       char *buf, *princ = NULL, *ccname = NULL;
+       char hostbuf[NI_MAXHOST], *host;
+       struct decoded_args arg = { };
+       const char *oid;
+
+       hostbuf[0] = '\0';
+
+       openlog(prog, 0, LOG_DAEMON);
+
+       while ((c = getopt_long(argc, argv, "ctv", long_options, NULL)) != -1) {
+               switch (c) {
+               case 'c':
+                       /* legacy option -- skip it */
+                       break;
+               case 't':
+                       try_dns++;
+                       break;
+               case 'v':
+                       printf("version: %s\n", CIFSSPNEGO_VERSION);
+                       goto out;
+               default:
+                       syslog(LOG_ERR, "unknown option: %c", c);
+                       goto out;
+               }
+       }
+
+       /* is there a key? */
+       if (argc <= optind) {
+               usage();
+               goto out;
+       }
+
+       /* get key and keyring values */
+       errno = 0;
+       key = strtol(argv[optind], NULL, 10);
+       if (errno != 0) {
+               key = 0;
+               syslog(LOG_ERR, "Invalid key format: %s", strerror(errno));
+               goto out;
+       }
+
+       rc = keyctl_describe_alloc(key, &buf);
+       if (rc == -1) {
+               syslog(LOG_ERR, "keyctl_describe_alloc failed: %s",
+                      strerror(errno));
+               rc = 1;
+               goto out;
+       }
+
+       syslog(LOG_DEBUG, "key description: %s", buf);
+
+       if ((strncmp(buf, "cifs.resolver", sizeof("cifs.resolver")-1) == 0) ||
+           (strncmp(buf, "dns_resolver", sizeof("dns_resolver")-1) == 0)) {
+               rc = cifs_resolver(key, buf);
+               goto out;
+       }
+
+       have = decode_key_description(buf, &arg);
+       SAFE_FREE(buf);
+       if ((have & DKD_MUSTHAVE_SET) != DKD_MUSTHAVE_SET) {
+               syslog(LOG_ERR, "unable to get necessary params from key "
+                               "description (0x%x)", have);
+               rc = 1;
+               goto out;
+       }
+
+       if (arg.ver > CIFS_SPNEGO_UPCALL_VERSION) {
+               syslog(LOG_ERR, "incompatible kernel upcall version: 0x%x",
+                               arg.ver);
+               rc = 1;
+               goto out;
+       }
+
+       if (have & DKD_HAVE_UID) {
+               rc = setuid(arg.uid);
+               if (rc == -1) {
+                       syslog(LOG_ERR, "setuid: %s", strerror(errno));
+                       goto out;
+               }
+
+               ccname = find_krb5_cc(CIFS_DEFAULT_KRB5_DIR, arg.uid);
+       }
+
+       host = arg.hostname;
+
+       // do mech specific authorization
+       switch (arg.sec) {
+       case MS_KRB5:
+       case KRB5:
+retry_new_hostname:
+               /* for "cifs/" service name + terminating 0 */
+               datalen = strlen(host) + 5 + 1;
+               princ = SMB_XMALLOC_ARRAY(char, datalen);
+               if (!princ) {
+                       rc = -ENOMEM;
+                       break;
+               }
+
+               if (arg.sec == MS_KRB5)
+                       oid = OID_KERBEROS5_OLD;
+               else
+                       oid = OID_KERBEROS5;
+
+               /*
+                * try getting a cifs/ principal first and then fall back to
+                * getting a host/ principal if that doesn't work.
+                */
+               strlcpy(princ, "cifs/", datalen);
+               strlcpy(princ + 5, host, datalen - 5);
+               rc = handle_krb5_mech(oid, princ, &secblob, &sess_key, ccname);
+               if (!rc)
+                       break;
+
+               memcpy(princ, "host/", 5);
+               rc = handle_krb5_mech(oid, princ, &secblob, &sess_key, ccname);
+               if (!rc)
+                       break;
+
+               if (!try_dns || !(have & DKD_HAVE_IP))
+                       break;
+
+               rc = ip_to_fqdn(arg.ip, hostbuf, sizeof(hostbuf));
+               if (rc)
+                       break;
+
+               SAFE_FREE(princ);
+               try_dns = 0;
+               host = hostbuf;
+               goto retry_new_hostname;
+       default:
+               syslog(LOG_ERR, "sectype: %d is not implemented", arg.sec);
+               rc = 1;
+               break;
+       }
+
+       SAFE_FREE(princ);
+
+       if (rc)
+               goto out;
+
+       /* pack SecurityBLob and SessionKey into downcall packet */
+       datalen =
+           sizeof(struct cifs_spnego_msg) + secblob.length + sess_key.length;
+       keydata = (struct cifs_spnego_msg*)SMB_XMALLOC_ARRAY(char, datalen);
+       if (!keydata) {
+               rc = 1;
+               goto out;
+       }
+       keydata->version = arg.ver;
+       keydata->flags = 0;
+       keydata->sesskey_len = sess_key.length;
+       keydata->secblob_len = secblob.length;
+       memcpy(&(keydata->data), sess_key.data, sess_key.length);
+       memcpy(&(keydata->data) + keydata->sesskey_len,
+              secblob.data, secblob.length);
+
+       /* setup key */
+       rc = keyctl_instantiate(key, keydata, datalen, 0);
+       if (rc == -1) {
+               syslog(LOG_ERR, "keyctl_instantiate: %s", strerror(errno));
+               goto out;
+       }
+
+       /* BB: maybe we need use timeout for key: for example no more then
+        * ticket lifietime? */
+       /* keyctl_set_timeout( key, 60); */
+out:
+       /*
+        * on error, negatively instantiate the key ourselves so that we can
+        * make sure the kernel doesn't hang it off of a searchable keyring
+        * and interfere with the next attempt to instantiate the key.
+        */
+       if (rc != 0  && key == 0)
+               keyctl_negate(key, 1, KEY_REQKEY_DEFL_DEFAULT);
+       data_blob_free(&secblob);
+       data_blob_free(&sess_key);
+       SAFE_FREE(ccname);
+       SAFE_FREE(arg.hostname);
+       SAFE_FREE(arg.ip);
+       SAFE_FREE(keydata);
+       return rc;
+}
diff --git a/cifs_spnego.h b/cifs_spnego.h
new file mode 100644 (file)
index 0000000..f8753a7
--- /dev/null
@@ -0,0 +1,46 @@
+/*
+ *   fs/cifs/cifs_spnego.h -- SPNEGO upcall management for CIFS
+ *
+ *   Copyright (c) 2007 Red Hat, Inc.
+ *   Author(s): Jeff Layton (jlayton@redhat.com)
+ *              Steve French (sfrench@us.ibm.com)
+ *
+ *   This library is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU Lesser General Public License as published
+ *   by the Free Software Foundation; either version 2.1 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This library is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+ *   the GNU Lesser General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Lesser General Public License
+ *   along with this library; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef _CIFS_SPNEGO_H
+#define _CIFS_SPNEGO_H
+
+#define CIFS_SPNEGO_UPCALL_VERSION 2
+
+/*
+ * The version field should always be set to CIFS_SPNEGO_UPCALL_VERSION.
+ * The flags field is for future use. The request-key callout should set
+ * sesskey_len and secblob_len, and then concatenate the SessKey+SecBlob
+ * and stuff it in the data field.
+ */
+struct cifs_spnego_msg {
+       uint32_t version;
+       uint32_t flags;
+       uint32_t sesskey_len;
+       uint32_t secblob_len;
+       uint8_t data[1];
+};
+
+#ifdef __KERNEL__
+extern struct key_type cifs_spnego_key_type;
+#endif                         /* KERNEL */
+
+#endif                         /* _CIFS_SPNEGO_H */
diff --git a/mount.cifs.c b/mount.cifs.c
new file mode 100644 (file)
index 0000000..d307f4f
--- /dev/null
@@ -0,0 +1,1779 @@
+/* 
+   Mount helper utility for Linux CIFS VFS (virtual filesystem) client
+   Copyright (C) 2003,2008 Steve French  (sfrench@us.ibm.com)
+   Copyright (C) 2008 Jeremy Allison (jra@samba.org)
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <pwd.h>
+#include <grp.h>
+#include <ctype.h>
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/stat.h>
+#include <sys/utsname.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
+#include <getopt.h>
+#include <errno.h>
+#include <netdb.h>
+#include <string.h>
+#include <mntent.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <fstab.h>
+#include "mount.h"
+
+#define MOUNT_CIFS_VERSION_MAJOR "1"
+#define MOUNT_CIFS_VERSION_MINOR "14"
+
+#ifndef MOUNT_CIFS_VENDOR_SUFFIX
+ #ifdef _SAMBA_BUILD_
+  #include "version.h"
+  #ifdef SAMBA_VERSION_VENDOR_SUFFIX
+   #define MOUNT_CIFS_VENDOR_SUFFIX "-"SAMBA_VERSION_OFFICIAL_STRING"-"SAMBA_VERSION_VENDOR_SUFFIX
+  #else
+   #define MOUNT_CIFS_VENDOR_SUFFIX "-"SAMBA_VERSION_OFFICIAL_STRING
+  #endif /* SAMBA_VERSION_OFFICIAL_STRING and SAMBA_VERSION_VENDOR_SUFFIX */
+ #else
+   #define MOUNT_CIFS_VENDOR_SUFFIX ""
+ #endif /* _SAMBA_BUILD_ */
+#endif /* MOUNT_CIFS_VENDOR_SUFFIX */
+
+#ifdef _SAMBA_BUILD_
+#include "include/config.h"
+#endif
+
+#ifndef MS_MOVE 
+#define MS_MOVE 8192 
+#endif 
+
+#ifndef MS_BIND
+#define MS_BIND 4096
+#endif
+
+/* private flags - clear these before passing to kernel */
+#define MS_USERS       0x40000000
+#define MS_USER                0x80000000
+
+#define MAX_UNC_LEN 1024
+
+#ifndef SAFE_FREE
+#define SAFE_FREE(x) do { if ((x) != NULL) {free(x); x=NULL;} } while(0)
+#endif
+
+#define MOUNT_PASSWD_SIZE 128
+#define DOMAIN_SIZE 64
+
+/* currently maximum length of IPv6 address string */
+#define MAX_ADDRESS_LEN INET6_ADDRSTRLEN
+
+/*
+ * mount.cifs has been the subject of many "security" bugs that have arisen
+ * because of users and distributions installing it as a setuid root program.
+ * mount.cifs has not been audited for security. Thus, we strongly recommend
+ * that it not be installed setuid root. To make that abundantly clear,
+ * mount.cifs now check whether it's running setuid root and exit with an
+ * error if it is. If you wish to disable this check, then set the following
+ * #define to 1, but please realize that you do so at your own peril.
+ */
+#define CIFS_DISABLE_SETUID_CHECK 0
+
+/*
+ * By default, mount.cifs follows the conventions set forth by /bin/mount
+ * for user mounts. That is, it requires that the mount be listed in
+ * /etc/fstab with the "user" option when run as an unprivileged user and
+ * mount.cifs is setuid root.
+ *
+ * Older versions of mount.cifs however were "looser" in this regard. When
+ * made setuid root, a user could run mount.cifs directly and mount any share
+ * on a directory owned by that user.
+ *
+ * The legacy behavior is now disabled by default. To reenable it, set the
+ * following #define to true.
+ */
+#define CIFS_LEGACY_SETUID_CHECK 0
+
+/*
+ * When an unprivileged user runs a setuid mount.cifs, we set certain mount
+ * flags by default. These defaults can be changed here.
+ */
+#define CIFS_SETUID_FLAGS (MS_NOSUID|MS_NODEV)
+
+const char *thisprogram;
+int verboseflag = 0;
+int fakemnt = 0;
+static int got_password = 0;
+static int got_user = 0;
+static int got_domain = 0;
+static int got_ip = 0;
+static int got_unc = 0;
+static int got_uid = 0;
+static int got_gid = 0;
+static char * user_name = NULL;
+static char * mountpassword = NULL;
+char * domain_name = NULL;
+char * prefixpath = NULL;
+const char *cifs_fstype = "cifs";
+
+/* glibc doesn't have strlcpy, strlcat. Ensure we do. JRA. We
+ * don't link to libreplace so need them here. */
+
+/* like strncpy but does not 0 fill the buffer and always null
+ *    terminates. bufsize is the size of the destination buffer */
+
+#ifndef HAVE_STRLCPY
+static size_t strlcpy(char *d, const char *s, size_t bufsize)
+{
+       size_t len = strlen(s);
+       size_t ret = len;
+       if (bufsize <= 0) return 0;
+       if (len >= bufsize) len = bufsize-1;
+       memcpy(d, s, len);
+       d[len] = 0;
+       return ret;
+}
+#endif
+
+/* like strncat but does not 0 fill the buffer and always null
+ *    terminates. bufsize is the length of the buffer, which should
+ *       be one more than the maximum resulting string length */
+
+#ifndef HAVE_STRLCAT
+static size_t strlcat(char *d, const char *s, size_t bufsize)
+{
+       size_t len1 = strlen(d);
+       size_t len2 = strlen(s);
+       size_t ret = len1 + len2;
+
+       if (len1+len2 >= bufsize) {
+               if (bufsize < (len1+1)) {
+                       return ret;
+               }
+               len2 = bufsize - (len1+1);
+       }
+       if (len2 > 0) {
+               memcpy(d+len1, s, len2);
+               d[len1+len2] = 0;
+       }
+       return ret;
+}
+#endif
+
+/*
+ * If an unprivileged user is doing the mounting then we need to ensure
+ * that the entry is in /etc/fstab.
+ */
+static int
+check_mountpoint(const char *progname, char *mountpoint)
+{
+       int err;
+       struct stat statbuf;
+
+       /* does mountpoint exist and is it a directory? */
+       err = stat(".", &statbuf);
+       if (err) {
+               fprintf(stderr, "%s: failed to stat %s: %s\n", progname,
+                               mountpoint, strerror(errno));
+               return EX_USAGE;
+       }
+
+       if (!S_ISDIR(statbuf.st_mode)) {
+               fprintf(stderr, "%s: %s is not a directory!", progname,
+                               mountpoint);
+               return EX_USAGE;
+       }
+
+#if CIFS_LEGACY_SETUID_CHECK
+       /* do extra checks on mountpoint for legacy setuid behavior */
+       if (!getuid() || geteuid())
+               return 0;
+
+       if (statbuf.st_uid != getuid()) {
+               fprintf(stderr, "%s: %s is not owned by user\n", progname,
+                       mountpoint);
+               return EX_USAGE;
+       }
+
+       if ((statbuf.st_mode & S_IRWXU) != S_IRWXU) {
+               fprintf(stderr, "%s: invalid permissions on %s\n", progname,
+                       mountpoint);
+               return EX_USAGE;
+       }
+#endif /* CIFS_LEGACY_SETUID_CHECK */
+
+       return 0;
+}
+
+#if CIFS_DISABLE_SETUID_CHECK
+static int
+check_setuid(void)
+{
+       return 0;
+}
+#else /* CIFS_DISABLE_SETUID_CHECK */
+static int
+check_setuid(void)
+{
+       if (getuid() && !geteuid()) {
+               printf("This mount.cifs program has been built with the "
+                       "ability to run as a setuid root program disabled.\n"
+                       "mount.cifs has not been well audited for security "
+                       "holes. Therefore the Samba team does not recommend "
+                       "installing it as a setuid root program.\n");
+               return 1;
+       }
+
+       return 0;
+}
+#endif /* CIFS_DISABLE_SETUID_CHECK */
+
+#if CIFS_LEGACY_SETUID_CHECK
+static int
+check_fstab(const char *progname, char *mountpoint, char *devname,
+           char **options)
+{
+       return 0;
+}
+#else /* CIFS_LEGACY_SETUID_CHECK */
+static int
+check_fstab(const char *progname, char *mountpoint, char *devname,
+           char **options)
+{
+       FILE *fstab;
+       struct mntent *mnt;
+
+       /* make sure this mount is listed in /etc/fstab */
+       fstab = setmntent(_PATH_FSTAB, "r");
+       if (!fstab) {
+               fprintf(stderr, "Couldn't open %s for reading!\n",
+                               _PATH_FSTAB);
+               return EX_FILEIO;
+       }
+
+       while((mnt = getmntent(fstab))) {
+               if (!strcmp(mountpoint, mnt->mnt_dir))
+                       break;
+       }
+       endmntent(fstab);
+
+       if (mnt == NULL || strcmp(mnt->mnt_fsname, devname)) {
+               fprintf(stderr, "%s: permission denied: no match for "
+                               "%s found in %s\n", progname, mountpoint,
+                               _PATH_FSTAB);
+               return EX_USAGE;
+       }
+
+       /*
+        * 'mount' munges the options from fstab before passing them
+        * to us. It is non-trivial to test that we have the correct
+        * set of options. We don't want to trust what the user
+        * gave us, so just take whatever is in /etc/fstab.
+        */
+       free(*options);
+       *options = strdup(mnt->mnt_opts);
+       return 0;
+}
+#endif /* CIFS_LEGACY_SETUID_CHECK */
+
+/* BB finish BB
+
+        cifs_umount
+        open nofollow - avoid symlink exposure? 
+        get owner of dir see if matches self or if root
+        call system(umount argv) etc.
+                
+BB end finish BB */
+
+static char * check_for_domain(char **);
+
+
+static void mount_cifs_usage(FILE *stream)
+{
+       fprintf(stream, "\nUsage:  %s <remotetarget> <dir> -o <options>\n", thisprogram);
+       fprintf(stream, "\nMount the remote target, specified as a UNC name,");
+       fprintf(stream, " to a local directory.\n\nOptions:\n");
+       fprintf(stream, "\tuser=<arg>\n\tpass=<arg>\n\tdom=<arg>\n");
+       fprintf(stream, "\nLess commonly used options:");
+       fprintf(stream, "\n\tcredentials=<filename>,guest,perm,noperm,setuids,nosetuids,rw,ro,");
+       fprintf(stream, "\n\tsep=<char>,iocharset=<codepage>,suid,nosuid,exec,noexec,serverino,");
+       fprintf(stream, "\n\tmapchars,nomapchars,nolock,servernetbiosname=<SRV_RFC1001NAME>");
+       fprintf(stream, "\n\tdirectio,nounix,cifsacl,sec=<authentication mechanism>,sign");
+       fprintf(stream, "\n\nOptions not needed for servers supporting CIFS Unix extensions");
+       fprintf(stream, "\n\t(e.g. unneeded for mounts to most Samba versions):");
+       fprintf(stream, "\n\tuid=<uid>,gid=<gid>,dir_mode=<mode>,file_mode=<mode>,sfu");
+       fprintf(stream, "\n\nRarely used options:");
+       fprintf(stream, "\n\tport=<tcpport>,rsize=<size>,wsize=<size>,unc=<unc_name>,ip=<ip_address>,");
+       fprintf(stream, "\n\tdev,nodev,nouser_xattr,netbiosname=<OUR_RFC1001NAME>,hard,soft,intr,");
+       fprintf(stream, "\n\tnointr,ignorecase,noposixpaths,noacl,prefixpath=<path>,nobrl");
+       fprintf(stream, "\n\nOptions are described in more detail in the manual page");
+       fprintf(stream, "\n\tman 8 mount.cifs\n");
+       fprintf(stream, "\nTo display the version number of the mount helper:");
+       fprintf(stream, "\n\t%s -V\n",thisprogram);
+
+       SAFE_FREE(mountpassword);
+
+       if (stream == stderr)
+               exit(EX_USAGE);
+       exit(0);
+}
+
+/* caller frees username if necessary */
+static char * getusername(void) {
+       char *username = NULL;
+       struct passwd *password = getpwuid(getuid());
+
+       if (password) {
+               username = password->pw_name;
+       }
+       return username;
+}
+
+static int open_cred_file(char * file_name)
+{
+       char * line_buf;
+       char * temp_val;
+       FILE * fs;
+       int i, length;
+
+       i = access(file_name, R_OK);
+       if (i)
+               return i;
+
+       fs = fopen(file_name,"r");
+       if(fs == NULL)
+               return errno;
+       line_buf = (char *)malloc(4096);
+       if(line_buf == NULL) {
+               fclose(fs);
+               return ENOMEM;
+       }
+
+       while(fgets(line_buf,4096,fs)) {
+               /* parse line from credential file */
+
+               /* eat leading white space */
+               for(i=0;i<4086;i++) {
+                       if((line_buf[i] != ' ') && (line_buf[i] != '\t'))
+                               break;
+                       /* if whitespace - skip past it */
+               }
+               if (strncasecmp("username",line_buf+i,8) == 0) {
+                       temp_val = strchr(line_buf + i,'=');
+                       if(temp_val) {
+                               /* go past equals sign */
+                               temp_val++;
+                               for(length = 0;length<4087;length++) {
+                                       if ((temp_val[length] == '\n')
+                                           || (temp_val[length] == '\0')) {
+                                               temp_val[length] = '\0';
+                                               break;
+                                       }
+                               }
+                               if(length > 4086) {
+                                       fprintf(stderr, "mount.cifs failed due to malformed username in credentials file\n");
+                                       memset(line_buf,0,4096);
+                                       exit(EX_USAGE);
+                               } else {
+                                       got_user = 1;
+                                       user_name = (char *)calloc(1 + length,1);
+                                       /* BB adding free of user_name string before exit,
+                                               not really necessary but would be cleaner */
+                                       strlcpy(user_name,temp_val, length+1);
+                               }
+                       }
+               } else if (strncasecmp("password",line_buf+i,8) == 0) {
+                       temp_val = strchr(line_buf+i,'=');
+                       if(temp_val) {
+                               /* go past equals sign */
+                               temp_val++;
+                               for(length = 0;length<MOUNT_PASSWD_SIZE+1;length++) {
+                                       if ((temp_val[length] == '\n')
+                                           || (temp_val[length] == '\0')) {
+                                               temp_val[length] = '\0';
+                                               break;
+                                       }
+                               }
+                               if(length > MOUNT_PASSWD_SIZE) {
+                                       fprintf(stderr, "mount.cifs failed: password in credentials file too long\n");
+                                       memset(line_buf,0, 4096);
+                                       exit(EX_USAGE);
+                               } else {
+                                       if(mountpassword == NULL) {
+                                               mountpassword = (char *)calloc(MOUNT_PASSWD_SIZE+1,1);
+                                       } else
+                                               memset(mountpassword,0,MOUNT_PASSWD_SIZE);
+                                       if(mountpassword) {
+                                               strlcpy(mountpassword,temp_val,MOUNT_PASSWD_SIZE+1);
+                                               got_password = 1;
+                                       }
+                               }
+                       }
+                } else if (strncasecmp("domain",line_buf+i,6) == 0) {
+                        temp_val = strchr(line_buf+i,'=');
+                        if(temp_val) {
+                                /* go past equals sign */
+                                temp_val++;
+                               if(verboseflag)
+                                       fprintf(stderr, "\nDomain %s\n",temp_val);
+                                for(length = 0;length<DOMAIN_SIZE+1;length++) {
+                                       if ((temp_val[length] == '\n')
+                                           || (temp_val[length] == '\0')) {
+                                               temp_val[length] = '\0';
+                                               break;
+                                       }
+                                }
+                                if(length > DOMAIN_SIZE) {
+                                        fprintf(stderr, "mount.cifs failed: domain in credentials file too long\n");
+                                        exit(EX_USAGE);
+                                } else {
+                                        if(domain_name == NULL) {
+                                                domain_name = (char *)calloc(DOMAIN_SIZE+1,1);
+                                        } else
+                                                memset(domain_name,0,DOMAIN_SIZE);
+                                        if(domain_name) {
+                                                strlcpy(domain_name,temp_val,DOMAIN_SIZE+1);
+                                                got_domain = 1;
+                                        }
+                                }
+                        }
+                }
+
+       }
+       fclose(fs);
+       SAFE_FREE(line_buf);
+       return 0;
+}
+
+static int get_password_from_file(int file_descript, char * filename)
+{
+       int rc = 0;
+       int i;
+       char c;
+
+       if(mountpassword == NULL)
+               mountpassword = (char *)calloc(MOUNT_PASSWD_SIZE+1,1);
+       else 
+               memset(mountpassword, 0, MOUNT_PASSWD_SIZE);
+
+       if (mountpassword == NULL) {
+               fprintf(stderr, "malloc failed\n");
+               exit(EX_SYSERR);
+       }
+
+       if(filename != NULL) {
+               rc = access(filename, R_OK);
+               if (rc) {
+                       fprintf(stderr, "mount.cifs failed: access check of %s failed: %s\n",
+                                       filename, strerror(errno));
+                       exit(EX_SYSERR);
+               }
+               file_descript = open(filename, O_RDONLY);
+               if(file_descript < 0) {
+                       fprintf(stderr, "mount.cifs failed. %s attempting to open password file %s\n",
+                                  strerror(errno),filename);
+                       exit(EX_SYSERR);
+               }
+       }
+       /* else file already open and fd provided */
+
+       for(i=0;i<MOUNT_PASSWD_SIZE;i++) {
+               rc = read(file_descript,&c,1);
+               if(rc < 0) {
+                       fprintf(stderr, "mount.cifs failed. Error %s reading password file\n",strerror(errno));
+                       if(filename != NULL)
+                               close(file_descript);
+                       exit(EX_SYSERR);
+               } else if(rc == 0) {
+                       if(mountpassword[0] == 0) {
+                               if(verboseflag)
+                                       fprintf(stderr, "\nWarning: null password used since cifs password file empty");
+                       }
+                       break;
+               } else /* read valid character */ {
+                       if((c == 0) || (c == '\n')) {
+                               mountpassword[i] = '\0';
+                               break;
+                       } else 
+                               mountpassword[i] = c;
+               }
+       }
+       if((i == MOUNT_PASSWD_SIZE) && (verboseflag)) {
+               fprintf(stderr, "\nWarning: password longer than %d characters specified in cifs password file",
+                       MOUNT_PASSWD_SIZE);
+       }
+       got_password = 1;
+       if(filename != NULL) {
+               close(file_descript);
+       }
+
+       return rc;
+}
+
+static int parse_options(char ** optionsp, unsigned long * filesys_flags)
+{
+       const char * data;
+       char * percent_char = NULL;
+       char * value = NULL;
+       char * next_keyword = NULL;
+       char * out = NULL;
+       int out_len = 0;
+       int word_len;
+       int rc = 0;
+       char user[32];
+       char group[32];
+
+       if (!optionsp || !*optionsp)
+               return 1;
+       data = *optionsp;
+
+       /* BB fixme check for separator override BB */
+
+       if (getuid()) {
+               got_uid = 1;
+               snprintf(user,sizeof(user),"%u",getuid());
+               got_gid = 1;
+               snprintf(group,sizeof(group),"%u",getgid());
+       }
+
+/* while ((data = strsep(&options, ",")) != NULL) { */
+       while(data != NULL) {
+               /*  check if ends with trailing comma */
+               if(*data == 0)
+                       break;
+
+               /* format is keyword=value,keyword2=value2,keyword3=value3 etc.) */
+               /* data  = next keyword */
+               /* value = next value ie stuff after equal sign */
+
+               next_keyword = strchr(data,','); /* BB handle sep= */
+       
+               /* temporarily null terminate end of keyword=value pair */
+               if(next_keyword)
+                       *next_keyword++ = 0;
+
+               /* temporarily null terminate keyword to make keyword and value distinct */
+               if ((value = strchr(data, '=')) != NULL) {
+                       *value = '\0';
+                       value++;
+               }
+
+               if (strncmp(data, "users",5) == 0) {
+                       if(!value || !*value) {
+                               *filesys_flags |= MS_USERS;
+                               goto nocopy;
+                       }
+               } else if (strncmp(data, "user_xattr",10) == 0) {
+                  /* do nothing - need to skip so not parsed as user name */
+               } else if (strncmp(data, "user", 4) == 0) {
+
+                       if (!value || !*value) {
+                               if(data[4] == '\0') {
+                                       *filesys_flags |= MS_USER;
+                                       goto nocopy;
+                               } else {
+                                       fprintf(stderr, "username specified with no parameter\n");
+                                       SAFE_FREE(out);
+                                       return 1;       /* needs_arg; */
+                               }
+                       } else {
+                               if (strnlen(value, 260) < 260) {
+                                       got_user=1;
+                                       percent_char = strchr(value,'%');
+                                       if(percent_char) {
+                                               *percent_char = ',';
+                                               if(mountpassword == NULL)
+                                                       mountpassword = (char *)calloc(MOUNT_PASSWD_SIZE+1,1);
+                                               if(mountpassword) {
+                                                       if(got_password)
+                                                               fprintf(stderr, "\nmount.cifs warning - password specified twice\n");
+                                                       got_password = 1;
+                                                       percent_char++;
+                                                       strlcpy(mountpassword, percent_char,MOUNT_PASSWD_SIZE+1);
+                                               /*  remove password from username */
+                                                       while(*percent_char != 0) {
+                                                               *percent_char = ',';
+                                                               percent_char++;
+                                                       }
+                                               }
+                                       }
+                                       /* this is only case in which the user
+                                       name buf is not malloc - so we have to
+                                       check for domain name embedded within
+                                       the user name here since the later
+                                       call to check_for_domain will not be
+                                       invoked */
+                                       domain_name = check_for_domain(&value);
+                               } else {
+                                       fprintf(stderr, "username too long\n");
+                                       SAFE_FREE(out);
+                                       return 1;
+                               }
+                       }
+               } else if (strncmp(data, "pass", 4) == 0) {
+                       if (!value || !*value) {
+                               if(got_password) {
+                                       fprintf(stderr, "\npassword specified twice, ignoring second\n");
+                               } else
+                                       got_password = 1;
+                       } else if (strnlen(value, MOUNT_PASSWD_SIZE) < MOUNT_PASSWD_SIZE) {
+                               if (got_password) {
+                                       fprintf(stderr, "\nmount.cifs warning - password specified twice\n");
+                               } else {
+                                       mountpassword = strndup(value, MOUNT_PASSWD_SIZE);
+                                       if (!mountpassword) {
+                                               fprintf(stderr, "mount.cifs error: %s", strerror(ENOMEM));
+                                               SAFE_FREE(out);
+                                               return 1;
+                                       }
+                                       got_password = 1;
+                               }
+                       } else {
+                               fprintf(stderr, "password too long\n");
+                               SAFE_FREE(out);
+                               return 1;
+                       }
+                       goto nocopy;
+               } else if (strncmp(data, "sec", 3) == 0) {
+                       if (value) {
+                               if (!strncmp(value, "none", 4) ||
+                                   !strncmp(value, "krb5", 4))
+                                       got_password = 1;
+                       }
+               } else if (strncmp(data, "ip", 2) == 0) {
+                       if (!value || !*value) {
+                               fprintf(stderr, "target ip address argument missing");
+                       } else if (strnlen(value, MAX_ADDRESS_LEN) <= MAX_ADDRESS_LEN) {
+                               if(verboseflag)
+                                       fprintf(stderr, "ip address %s override specified\n",value);
+                               got_ip = 1;
+                       } else {
+                               fprintf(stderr, "ip address too long\n");
+                               SAFE_FREE(out);
+                               return 1;
+                       }
+               } else if ((strncmp(data, "unc", 3) == 0)
+                  || (strncmp(data, "target", 6) == 0)
+                  || (strncmp(data, "path", 4) == 0)) {
+                       if (!value || !*value) {
+                               fprintf(stderr, "invalid path to network resource\n");
+                               SAFE_FREE(out);
+                               return 1;  /* needs_arg; */
+                       } else if(strnlen(value,5) < 5) {
+                               fprintf(stderr, "UNC name too short");
+                       }
+
+                       if (strnlen(value, 300) < 300) {
+                               got_unc = 1;
+                               if (strncmp(value, "//", 2) == 0) {
+                                       if(got_unc)
+                                               fprintf(stderr, "unc name specified twice, ignoring second\n");
+                                       else
+                                               got_unc = 1;
+                               } else if (strncmp(value, "\\\\", 2) != 0) {                       
+                                       fprintf(stderr, "UNC Path does not begin with // or \\\\ \n");
+                                       SAFE_FREE(out);
+                                       return 1;
+                               } else {
+                                       if(got_unc)
+                                               fprintf(stderr, "unc name specified twice, ignoring second\n");
+                                       else
+                                               got_unc = 1;
+                               }
+                       } else {
+                               fprintf(stderr, "CIFS: UNC name too long\n");
+                               SAFE_FREE(out);
+                               return 1;
+                       }
+               } 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) {
+                               fprintf(stderr, "CIFS: invalid domain name\n");
+                               SAFE_FREE(out);
+                               return 1;       /* needs_arg; */
+                       }
+                       if (strnlen(value, DOMAIN_SIZE+1) < DOMAIN_SIZE+1) {
+                               got_domain = 1;
+                       } else {
+                               fprintf(stderr, "domain name too long\n");
+                               SAFE_FREE(out);
+                               return 1;
+                       }
+               } else if (strncmp(data, "cred", 4) == 0) {
+                       if (value && *value) {
+                               rc = open_cred_file(value);
+                               if(rc) {
+                                       fprintf(stderr, "error %d (%s) opening credential file %s\n",
+                                               rc, strerror(rc), value);
+                                       SAFE_FREE(out);
+                                       return 1;
+                               }
+                       } else {
+                               fprintf(stderr, "invalid credential file name specified\n");
+                               SAFE_FREE(out);
+                               return 1;
+                       }
+               } else if (strncmp(data, "uid", 3) == 0) {
+                       if (value && *value) {
+                               got_uid = 1;
+                               if (!isdigit(*value)) {
+                                       struct passwd *pw;
+
+                                       if (!(pw = getpwnam(value))) {
+                                               fprintf(stderr, "bad user name \"%s\"\n", value);
+                                               exit(EX_USAGE);
+                                       }
+                                       snprintf(user, sizeof(user), "%u", pw->pw_uid);
+                               } else {
+                                       strlcpy(user,value,sizeof(user));
+                               }
+                       }
+                       goto nocopy;
+               } else if (strncmp(data, "gid", 3) == 0) {
+                       if (value && *value) {
+                               got_gid = 1;
+                               if (!isdigit(*value)) {
+                                       struct group *gr;
+
+                                       if (!(gr = getgrnam(value))) {
+                                               fprintf(stderr, "bad group name \"%s\"\n", value);
+                                               exit(EX_USAGE);
+                                       }
+                                       snprintf(group, sizeof(group), "%u", gr->gr_gid);
+                               } else {
+                                       strlcpy(group,value,sizeof(group));
+                               }
+                       }
+                       goto nocopy;
+       /* fmask and dmask synonyms for people used to smbfs syntax */
+               } else if (strcmp(data, "file_mode") == 0 || strcmp(data, "fmask")==0) {
+                       if (!value || !*value) {
+                               fprintf(stderr, "Option '%s' requires a numerical argument\n", data);
+                               SAFE_FREE(out);
+                               return 1;
+                       }
+
+                       if (value[0] != '0') {
+                               fprintf(stderr, "WARNING: '%s' not expressed in octal.\n", data);
+                       }
+
+                       if (strcmp (data, "fmask") == 0) {
+                               fprintf(stderr, "WARNING: CIFS mount option 'fmask' is deprecated. Use 'file_mode' instead.\n");
+                               data = "file_mode"; /* BB fix this */
+                       }
+               } else if (strcmp(data, "dir_mode") == 0 || strcmp(data, "dmask")==0) {
+                       if (!value || !*value) {
+                               fprintf(stderr, "Option '%s' requires a numerical argument\n", data);
+                               SAFE_FREE(out);
+                               return 1;
+                       }
+
+                       if (value[0] != '0') {
+                               fprintf(stderr, "WARNING: '%s' not expressed in octal.\n", data);
+                       }
+
+                       if (strcmp (data, "dmask") == 0) {
+                               fprintf(stderr, "WARNING: CIFS mount option 'dmask' is deprecated. Use 'dir_mode' instead.\n");
+                               data = "dir_mode";
+                       }
+                       /* the following eight mount options should be
+                       stripped out from what is passed into the kernel
+                       since these eight options are best passed as the
+                       mount flags rather than redundantly to the kernel 
+                       and could generate spurious warnings depending on the
+                       level of the corresponding cifs vfs kernel code */
+               } else if (strncmp(data, "nosuid", 6) == 0) {
+                       *filesys_flags |= MS_NOSUID;
+               } else if (strncmp(data, "suid", 4) == 0) {
+                       *filesys_flags &= ~MS_NOSUID;
+               } else if (strncmp(data, "nodev", 5) == 0) {
+                       *filesys_flags |= MS_NODEV;
+               } else if ((strncmp(data, "nobrl", 5) == 0) || 
+                          (strncmp(data, "nolock", 6) == 0)) {
+                       *filesys_flags &= ~MS_MANDLOCK;
+               } else if (strncmp(data, "dev", 3) == 0) {
+                       *filesys_flags &= ~MS_NODEV;
+               } else if (strncmp(data, "noexec", 6) == 0) {
+                       *filesys_flags |= MS_NOEXEC;
+               } else if (strncmp(data, "exec", 4) == 0) {
+                       *filesys_flags &= ~MS_NOEXEC;
+               } else if (strncmp(data, "guest", 5) == 0) {
+                       user_name = (char *)calloc(1, 1);
+                       got_user = 1;
+                       got_password = 1;
+               } else if (strncmp(data, "ro", 2) == 0) {
+                       *filesys_flags |= MS_RDONLY;
+                       goto nocopy;
+               } else if (strncmp(data, "rw", 2) == 0) {
+                       *filesys_flags &= ~MS_RDONLY;
+                       goto nocopy;
+                } else if (strncmp(data, "remount", 7) == 0) {
+                        *filesys_flags |= MS_REMOUNT;
+               } /* else if (strnicmp(data, "port", 4) == 0) {
+                       if (value && *value) {
+                               vol->port =
+                                       simple_strtoul(value, &value, 0);
+                       }
+               } else if (strnicmp(data, "rsize", 5) == 0) {
+                       if (value && *value) {
+                               vol->rsize =
+                                       simple_strtoul(value, &value, 0);
+                       }
+               } else if (strnicmp(data, "wsize", 5) == 0) {
+                       if (value && *value) {
+                               vol->wsize =
+                                       simple_strtoul(value, &value, 0);
+                       }
+               } else if (strnicmp(data, "version", 3) == 0) {
+               } else {
+                       fprintf(stderr, "CIFS: Unknown mount option %s\n",data);
+               } */ /* nothing to do on those four mount options above.
+                       Just pass to kernel and ignore them here */
+
+               /* Copy (possibly modified) option to out */
+               word_len = strlen(data);
+               if (value)
+                       word_len += 1 + strlen(value);
+
+               out = (char *)realloc(out, out_len + word_len + 2);
+               if (out == NULL) {
+                       perror("malloc");
+                       exit(EX_SYSERR);
+               }
+
+               if (out_len) {
+                       strlcat(out, ",", out_len + word_len + 2);
+                       out_len++;
+               }
+
+               if (value)
+                       snprintf(out + out_len, word_len + 1, "%s=%s", data, value);
+               else
+                       snprintf(out + out_len, word_len + 1, "%s", data);
+               out_len = strlen(out);
+
+nocopy:
+               data = next_keyword;
+       }
+
+       /* special-case the uid and gid */
+       if (got_uid) {
+               word_len = strlen(user);
+
+               out = (char *)realloc(out, out_len + word_len + 6);
+               if (out == NULL) {
+                       perror("malloc");
+                       exit(EX_SYSERR);
+               }
+
+               if (out_len) {
+                       strlcat(out, ",", out_len + word_len + 6);
+                       out_len++;
+               }
+               snprintf(out + out_len, word_len + 5, "uid=%s", user);
+               out_len = strlen(out);
+       }
+       if (got_gid) {
+               word_len = strlen(group);
+
+               out = (char *)realloc(out, out_len + 1 + word_len + 6);
+               if (out == NULL) {
+               perror("malloc");
+                       exit(EX_SYSERR);
+               }
+
+               if (out_len) {
+                       strlcat(out, ",", out_len + word_len + 6);
+                       out_len++;
+               }
+               snprintf(out + out_len, word_len + 5, "gid=%s", group);
+               out_len = strlen(out);
+       }
+
+       SAFE_FREE(*optionsp);
+       *optionsp = out;
+       return 0;
+}
+
+/* replace all (one or more) commas with double commas */
+static void check_for_comma(char ** ppasswrd)
+{
+       char *new_pass_buf;
+       char *pass;
+       int i,j;
+       int number_of_commas = 0;
+       int len;
+
+       if(ppasswrd == NULL)
+               return;
+       else 
+               (pass = *ppasswrd);
+
+       len = strlen(pass);
+
+       for(i=0;i<len;i++)  {
+               if(pass[i] == ',')
+                       number_of_commas++;
+       }
+
+       if(number_of_commas == 0)
+               return;
+       if(number_of_commas > MOUNT_PASSWD_SIZE) {
+               /* would otherwise overflow the mount options buffer */
+               fprintf(stderr, "\nInvalid password. Password contains too many commas.\n");
+               return;
+       }
+
+       new_pass_buf = (char *)malloc(len+number_of_commas+1);
+       if(new_pass_buf == NULL)
+               return;
+
+       for(i=0,j=0;i<len;i++,j++) {
+               new_pass_buf[j] = pass[i];
+               if(pass[i] == ',') {
+                       j++;
+                       new_pass_buf[j] = pass[i];
+               }
+       }
+       new_pass_buf[len+number_of_commas] = 0;
+
+       SAFE_FREE(*ppasswrd);
+       *ppasswrd = new_pass_buf;
+       
+       return;
+}
+
+/* Usernames can not have backslash in them and we use
+   [BB check if usernames can have forward slash in them BB] 
+   backslash as domain\user separator character
+*/
+static char * check_for_domain(char **ppuser)
+{
+       char * original_string;
+       char * usernm;
+       char * domainnm;
+       int    original_len;
+       int    len;
+       int    i;
+
+       if(ppuser == NULL)
+               return NULL;
+
+       original_string = *ppuser;
+
+       if (original_string == NULL)
+               return NULL;
+       
+       original_len = strlen(original_string);
+
+       usernm = strchr(*ppuser,'/');
+       if (usernm == NULL) {
+               usernm = strchr(*ppuser,'\\');
+               if (usernm == NULL)
+                       return NULL;
+       }
+
+       if(got_domain) {
+               fprintf(stderr, "Domain name specified twice. Username probably malformed\n");
+               return NULL;
+       }
+
+       usernm[0] = 0;
+       domainnm = *ppuser;
+       if (domainnm[0] != 0) {
+               got_domain = 1;
+       } else {
+               fprintf(stderr, "null domain\n");
+       }
+       len = strlen(domainnm);
+       /* reset domainm to new buffer, and copy
+       domain name into it */
+       domainnm = (char *)malloc(len+1);
+       if(domainnm == NULL)
+               return NULL;
+
+       strlcpy(domainnm,*ppuser,len+1);
+
+/*     move_string(*ppuser, usernm+1) */
+       len = strlen(usernm+1);
+
+       if(len >= original_len) {
+               /* should not happen */
+               return domainnm;
+       }
+
+       for(i=0;i<original_len;i++) {
+               if(i<len)
+                       original_string[i] = usernm[i+1];
+               else /* stuff with commas to remove last parm */
+                       original_string[i] = ',';
+       }
+
+       /* BB add check for more than one slash? 
+         strchr(*ppuser,'/');
+         strchr(*ppuser,'\\') 
+       */
+       
+       return domainnm;
+}
+
+/* replace all occurances of "from" in a string with "to" */
+static void replace_char(char *string, char from, char to, int maxlen)
+{
+       char *lastchar = string + maxlen;
+       while (string) {
+               string = strchr(string, from);
+               if (string) {
+                       *string = to;
+                       if (string >= lastchar)
+                               return;
+               }
+       }
+}
+
+/* Note that caller frees the returned buffer if necessary */
+static struct addrinfo *
+parse_server(char ** punc_name)
+{
+       char * unc_name = *punc_name;
+       int length = strnlen(unc_name, MAX_UNC_LEN);
+       char * share;
+       struct addrinfo *addrlist;
+       int rc;
+
+       if(length > (MAX_UNC_LEN - 1)) {
+               fprintf(stderr, "mount error: UNC name too long");
+               return NULL;
+       }
+       if ((strncasecmp("cifs://", unc_name, 7) == 0) ||
+           (strncasecmp("smb://", unc_name, 6) == 0)) {
+               fprintf(stderr, "\nMounting cifs URL not implemented yet. Attempt to mount %s\n", unc_name);
+               return NULL;
+       }
+
+       if(length < 3) {
+               /* BB add code to find DFS root here */
+               fprintf(stderr, "\nMounting the DFS root for domain not implemented yet\n");
+               return NULL;
+       } else {
+               if(strncmp(unc_name,"//",2) && strncmp(unc_name,"\\\\",2)) {
+                       /* check for nfs syntax ie server:share */
+                       share = strchr(unc_name,':');
+                       if(share) {
+                               *punc_name = (char *)malloc(length+3);
+                               if(*punc_name == NULL) {
+                                       /* put the original string back  if 
+                                          no memory left */
+                                       *punc_name = unc_name;
+                                       return NULL;
+                               }
+                               *share = '/';
+                               strlcpy((*punc_name)+2,unc_name,length+1);
+                               SAFE_FREE(unc_name);
+                               unc_name = *punc_name;
+                               unc_name[length+2] = 0;
+                               goto continue_unc_parsing;
+                       } else {
+                               fprintf(stderr, "mount error: improperly formatted UNC name.");
+                               fprintf(stderr, " %s does not begin with \\\\ or //\n",unc_name);
+                               return NULL;
+                       }
+               } else {
+continue_unc_parsing:
+                       unc_name[0] = '/';
+                       unc_name[1] = '/';
+                       unc_name += 2;
+
+                       /* allow for either delimiter between host and sharename */
+                       if ((share = strpbrk(unc_name, "/\\"))) {
+                               *share = 0;  /* temporarily terminate the string */
+                               share += 1;
+                               if(got_ip == 0) {
+                                       rc = getaddrinfo(unc_name, NULL, NULL, &addrlist);
+                                       if (rc != 0) {
+                                               fprintf(stderr, "mount error: could not resolve address for %s: %s\n",
+                                                       unc_name, gai_strerror(rc));
+                                               addrlist = NULL;
+                                       }
+                               }
+                               *(share - 1) = '/'; /* put delimiter back */
+
+                               /* we don't convert the prefixpath delimiters since '\\' is a valid char in posix paths */
+                               if ((prefixpath = strpbrk(share, "/\\"))) {
+                                       *prefixpath = 0;  /* permanently terminate the string */
+                                       if (!strlen(++prefixpath))
+                                               prefixpath = NULL; /* this needs to be done explicitly */
+                               }
+                               if(got_ip) {
+                                       if(verboseflag)
+                                               fprintf(stderr, "ip address specified explicitly\n");
+                                       return NULL;
+                               }
+                               /* BB should we pass an alternate version of the share name as Unicode */
+
+                               return addrlist; 
+                       } else {
+                               /* BB add code to find DFS root (send null path on get DFS Referral to specified server here */
+                               fprintf(stderr, "Mounting the DFS root for a particular server not implemented yet\n");
+                               return NULL;
+                       }
+               }
+       }
+}
+
+static struct option longopts[] = {
+       { "all", 0, NULL, 'a' },
+       { "help",0, NULL, 'h' },
+       { "move",0, NULL, 'm' },
+       { "bind",0, NULL, 'b' },
+       { "read-only", 0, NULL, 'r' },
+       { "ro", 0, NULL, 'r' },
+       { "verbose", 0, NULL, 'v' },
+       { "version", 0, NULL, 'V' },
+       { "read-write", 0, NULL, 'w' },
+       { "rw", 0, NULL, 'w' },
+       { "options", 1, NULL, 'o' },
+       { "type", 1, NULL, 't' },
+       { "rsize",1, NULL, 'R' },
+       { "wsize",1, NULL, 'W' },
+       { "uid", 1, NULL, '1'},
+       { "gid", 1, NULL, '2'},
+       { "user",1,NULL,'u'},
+       { "username",1,NULL,'u'},
+       { "dom",1,NULL,'d'},
+       { "domain",1,NULL,'d'},
+       { "password",1,NULL,'p'},
+       { "pass",1,NULL,'p'},
+       { "credentials",1,NULL,'c'},
+       { "port",1,NULL,'P'},
+       /* { "uuid",1,NULL,'U'}, */ /* BB unimplemented */
+       { NULL, 0, NULL, 0 }
+};
+
+/* convert a string to uppercase. return false if the string
+ * wasn't ASCII. Return success on a NULL ptr */
+static int
+uppercase_string(char *string)
+{
+       if (!string)
+               return 1;
+
+       while (*string) {
+               /* check for unicode */
+               if ((unsigned char) string[0] & 0x80)
+                       return 0;
+               *string = toupper((unsigned char) *string);
+               string++;
+       }
+
+       return 1;
+}
+
+static void print_cifs_mount_version(void)
+{
+       printf("mount.cifs version: %s.%s%s\n",
+               MOUNT_CIFS_VERSION_MAJOR,
+               MOUNT_CIFS_VERSION_MINOR,
+               MOUNT_CIFS_VENDOR_SUFFIX);
+}
+
+/*
+ * This function borrowed from fuse-utils...
+ *
+ * glibc's addmntent (at least as of 2.10 or so) doesn't properly encode
+ * newlines embedded within the text fields. To make sure no one corrupts
+ * the mtab, fail the mount if there are embedded newlines.
+ */
+static int check_newline(const char *progname, const char *name)
+{
+    const char *s;
+    for (s = "\n"; *s; s++) {
+        if (strchr(name, *s)) {
+            fprintf(stderr, "%s: illegal character 0x%02x in mount entry\n",
+                    progname, *s);
+            return EX_USAGE;
+        }
+    }
+    return 0;
+}
+
+static int check_mtab(const char *progname, const char *devname,
+                       const char *dir)
+{
+       if (check_newline(progname, devname) == -1 ||
+           check_newline(progname, dir) == -1)
+               return EX_USAGE;
+       return 0;
+}
+
+
+int main(int argc, char ** argv)
+{
+       int c;
+       unsigned long flags = MS_MANDLOCK;
+       char * orgoptions = NULL;
+       char * share_name = NULL;
+       const char * ipaddr = NULL;
+       char * uuid = NULL;
+       char * mountpoint = NULL;
+       char * options = NULL;
+       char * optionstail;
+       char * resolved_path = NULL;
+       char * temp;
+       char * dev_name;
+       int rc = 0;
+       int rsize = 0;
+       int wsize = 0;
+       int nomtab = 0;
+       int uid = 0;
+       int gid = 0;
+       int optlen = 0;
+       int orgoptlen = 0;
+       size_t options_size = 0;
+       size_t current_len;
+       int retry = 0; /* set when we have to retry mount with uppercase */
+       struct addrinfo *addrhead = NULL, *addr;
+       struct utsname sysinfo;
+       struct mntent mountent;
+       struct sockaddr_in *addr4;
+       struct sockaddr_in6 *addr6;
+       FILE * pmntfile;
+
+       if (check_setuid())
+               return EX_USAGE;
+
+       /* setlocale(LC_ALL, "");
+       bindtextdomain(PACKAGE, LOCALEDIR);
+       textdomain(PACKAGE); */
+
+       if(argc && argv)
+               thisprogram = argv[0];
+       else
+               mount_cifs_usage(stderr);
+
+       if(thisprogram == NULL)
+               thisprogram = "mount.cifs";
+
+       uname(&sysinfo);
+       /* BB add workstation name and domain and pass down */
+
+/* #ifdef _GNU_SOURCE
+       fprintf(stderr, " node: %s machine: %s sysname %s domain %s\n", sysinfo.nodename,sysinfo.machine,sysinfo.sysname,sysinfo.domainname);
+#endif */
+       if(argc > 2) {
+               dev_name = argv[1];
+               share_name = strndup(argv[1], MAX_UNC_LEN);
+               if (share_name == NULL) {
+                       fprintf(stderr, "%s: %s", argv[0], strerror(ENOMEM));
+                       exit(EX_SYSERR);
+               }
+               mountpoint = argv[2];
+       } else if (argc == 2) {
+               if ((strcmp(argv[1], "-V") == 0) ||
+                   (strcmp(argv[1], "--version") == 0))
+               {
+                       print_cifs_mount_version();
+                       exit(0);
+               }
+
+               if ((strcmp(argv[1], "-h") == 0) ||
+                   (strcmp(argv[1], "-?") == 0) ||
+                   (strcmp(argv[1], "--help") == 0))
+                       mount_cifs_usage(stdout);
+
+               mount_cifs_usage(stderr);
+       } else {
+               mount_cifs_usage(stderr);
+       }
+
+
+       /* add sharename in opts string as unc= parm */
+       while ((c = getopt_long (argc, argv, "afFhilL:no:O:rsSU:vVwt:",
+                        longopts, NULL)) != -1) {
+               switch (c) {
+/* No code to do the following  options yet */
+/*     case 'l':
+               list_with_volumelabel = 1;
+               break;
+       case 'L':
+               volumelabel = optarg;
+               break; */
+/*     case 'a':              
+               ++mount_all;
+               break; */
+
+               case '?':
+               case 'h':        /* help */
+                       mount_cifs_usage(stdout);
+               case 'n':
+                       ++nomtab;
+                       break;
+               case 'b':
+#ifdef MS_BIND
+                       flags |= MS_BIND;
+#else
+                       fprintf(stderr,
+                               "option 'b' (MS_BIND) not supported\n");
+#endif
+                       break;
+               case 'm':
+#ifdef MS_MOVE               
+                       flags |= MS_MOVE;
+#else
+                       fprintf(stderr,
+                               "option 'm' (MS_MOVE) not supported\n");
+#endif
+                       break;
+               case 'o':
+                       orgoptions = strdup(optarg);
+                   break;
+               case 'r':  /* mount readonly */
+                       flags |= MS_RDONLY;
+                       break;
+               case 'U':
+                       uuid = optarg;
+                       break;
+               case 'v':
+                       ++verboseflag;
+                       break;
+               case 'V':
+                       print_cifs_mount_version();
+                       exit (0);
+               case 'w':
+                       flags &= ~MS_RDONLY;
+                       break;
+               case 'R':
+                       rsize = atoi(optarg) ;
+                       break;
+               case 'W':
+                       wsize = atoi(optarg);
+                       break;
+               case '1':
+                       if (isdigit(*optarg)) {
+                               char *ep;
+
+                               uid = strtoul(optarg, &ep, 10);
+                               if (*ep) {
+                                       fprintf(stderr, "bad uid value \"%s\"\n", optarg);
+                                       exit(EX_USAGE);
+                               }
+                       } else {
+                               struct passwd *pw;
+
+                               if (!(pw = getpwnam(optarg))) {
+                                       fprintf(stderr, "bad user name \"%s\"\n", optarg);
+                                       exit(EX_USAGE);
+                               }
+                               uid = pw->pw_uid;
+                               endpwent();
+                       }
+                       break;
+               case '2':
+                       if (isdigit(*optarg)) {
+                               char *ep;
+
+                               gid = strtoul(optarg, &ep, 10);
+                               if (*ep) {
+                                       fprintf(stderr, "bad gid value \"%s\"\n", optarg);
+                                       exit(EX_USAGE);
+                               }
+                       } else {
+                               struct group *gr;
+
+                               if (!(gr = getgrnam(optarg))) {
+                                       fprintf(stderr, "bad user name \"%s\"\n", optarg);
+                                       exit(EX_USAGE);
+                               }
+                               gid = gr->gr_gid;
+                               endpwent();
+                       }
+                       break;
+               case 'u':
+                       got_user = 1;
+                       user_name = optarg;
+                       break;
+               case 'd':
+                       domain_name = optarg; /* BB fix this - currently ignored */
+                       got_domain = 1;
+                       break;
+               case 'p':
+                       if(mountpassword == NULL)
+                               mountpassword = (char *)calloc(MOUNT_PASSWD_SIZE+1,1);
+                       if(mountpassword) {
+                               got_password = 1;
+                               strlcpy(mountpassword,optarg,MOUNT_PASSWD_SIZE+1);
+                       }
+                       break;
+               case 'S':
+                       get_password_from_file(0 /* stdin */,NULL);
+                       break;
+               case 't':
+                       break;
+               case 'f':
+                       ++fakemnt;
+                       break;
+               default:
+                       fprintf(stderr, "unknown mount option %c\n",c);
+                       mount_cifs_usage(stderr);
+               }
+       }
+
+       if((argc < 3) || (dev_name == NULL) || (mountpoint == NULL)) {
+               mount_cifs_usage(stderr);
+       }
+
+       /* make sure mountpoint is legit */
+       rc = chdir(mountpoint);
+       if (rc) {
+               fprintf(stderr, "Couldn't chdir to %s: %s\n", mountpoint,
+                               strerror(errno));
+               rc = EX_USAGE;
+               goto mount_exit;
+       }
+
+       rc = check_mountpoint(thisprogram, mountpoint);
+       if (rc)
+               goto mount_exit;
+
+       /* sanity check for unprivileged mounts */
+       if (getuid()) {
+               rc = check_fstab(thisprogram, mountpoint, dev_name,
+                                &orgoptions);
+               if (rc)
+                       goto mount_exit;
+
+               /* enable any default user mount flags */
+               flags |= CIFS_SETUID_FLAGS;
+       }
+
+       if (getenv("PASSWD")) {
+               if(mountpassword == NULL)
+                       mountpassword = (char *)calloc(MOUNT_PASSWD_SIZE+1,1);
+               if(mountpassword) {
+                       strlcpy(mountpassword,getenv("PASSWD"),MOUNT_PASSWD_SIZE+1);
+                       got_password = 1;
+               }
+       } else if (getenv("PASSWD_FD")) {
+               get_password_from_file(atoi(getenv("PASSWD_FD")),NULL);
+       } else if (getenv("PASSWD_FILE")) {
+               get_password_from_file(0, getenv("PASSWD_FILE"));
+       }
+
+        if (orgoptions && parse_options(&orgoptions, &flags)) {
+                rc = EX_USAGE;
+               goto mount_exit;
+       }
+
+       if (getuid()) {
+#if !CIFS_LEGACY_SETUID_CHECK
+               if (!(flags & (MS_USERS|MS_USER))) {
+                       fprintf(stderr, "%s: permission denied\n", thisprogram);
+                       rc = EX_USAGE;
+                       goto mount_exit;
+               }
+#endif /* !CIFS_LEGACY_SETUID_CHECK */
+               
+               if (geteuid()) {
+                       fprintf(stderr, "%s: not installed setuid - \"user\" "
+                                       "CIFS mounts not supported.",
+                                       thisprogram);
+                       rc = EX_FAIL;
+                       goto mount_exit;
+               }
+       }
+
+       flags &= ~(MS_USERS|MS_USER);
+
+       addrhead = addr = parse_server(&share_name);
+       if((addrhead == NULL) && (got_ip == 0)) {
+               fprintf(stderr, "No ip address specified and hostname not found\n");
+               rc = EX_USAGE;
+               goto mount_exit;
+       }
+       
+       /* BB save off path and pop after mount returns? */
+       resolved_path = (char *)malloc(PATH_MAX+1);
+       if (!resolved_path) {
+               fprintf(stderr, "Unable to allocate memory.\n");
+               rc = EX_SYSERR;
+               goto mount_exit;
+       }
+
+       /* Note that if we can not canonicalize the name, we get
+          another chance to see if it is valid when we chdir to it */
+       if(!realpath(".", resolved_path)) {
+               fprintf(stderr, "Unable to resolve %s to canonical path: %s\n",
+                               mountpoint, strerror(errno));
+               rc = EX_SYSERR;
+               goto mount_exit;
+       }
+
+       mountpoint = resolved_path; 
+
+       if(got_user == 0) {
+               /* Note that the password will not be retrieved from the
+                  USER env variable (ie user%password form) as there is
+                  already a PASSWD environment varaible */
+               if (getenv("USER"))
+                       user_name = strdup(getenv("USER"));
+               if (user_name == NULL)
+                       user_name = getusername();
+               got_user = 1;
+       }
+       
+       if(got_password == 0) {
+               char *tmp_pass = getpass("Password: "); /* BB obsolete sys call but
+                                                          no good replacement yet. */
+               mountpassword = (char *)calloc(MOUNT_PASSWD_SIZE+1,1);
+               if (!tmp_pass || !mountpassword) {
+                       fprintf(stderr, "Password not entered, exiting\n");
+                       exit(EX_USAGE);
+               }
+               strlcpy(mountpassword, tmp_pass, MOUNT_PASSWD_SIZE+1);
+               got_password = 1;
+       }
+       /* FIXME launch daemon (handles dfs name resolution and credential change) 
+          remember to clear parms and overwrite password field before launching */
+       if(orgoptions) {
+               optlen = strlen(orgoptions);
+               orgoptlen = optlen;
+       } else
+               optlen = 0;
+       if(share_name)
+               optlen += strlen(share_name) + 4;
+       else {
+               fprintf(stderr, "No server share name specified\n");
+               fprintf(stderr, "\nMounting the DFS root for server not implemented yet\n");
+                exit(EX_USAGE);
+       }
+       if(user_name)
+               optlen += strlen(user_name) + 6;
+       optlen += MAX_ADDRESS_LEN + 4;
+       if(mountpassword)
+               optlen += strlen(mountpassword) + 6;
+mount_retry:
+       SAFE_FREE(options);
+       options_size = optlen + 10 + DOMAIN_SIZE;
+       options = (char *)malloc(options_size /* space for commas in password */ + 8 /* space for domain=  , domain name itself was counted as part of the length username string above */);
+
+       if(options == NULL) {
+               fprintf(stderr, "Could not allocate memory for mount options\n");
+               exit(EX_SYSERR);
+       }
+
+       strlcpy(options, "unc=", options_size);
+       strlcat(options,share_name,options_size);
+       /* scan backwards and reverse direction of slash */
+       temp = strrchr(options, '/');
+       if(temp > options + 6)
+               *temp = '\\';
+       if(user_name) {
+               /* check for syntax like user=domain\user */
+               if(got_domain == 0)
+                       domain_name = check_for_domain(&user_name);
+               strlcat(options,",user=",options_size);
+               strlcat(options,user_name,options_size);
+       }
+       if(retry == 0) {
+               if(domain_name) {
+                       /* extra length accounted for in option string above */
+                       strlcat(options,",domain=",options_size);
+                       strlcat(options,domain_name,options_size);
+               }
+       }
+
+       strlcat(options,",ver=",options_size);
+       strlcat(options,MOUNT_CIFS_VERSION_MAJOR,options_size);
+
+       if(orgoptions) {
+               strlcat(options,",",options_size);
+               strlcat(options,orgoptions,options_size);
+       }
+       if(prefixpath) {
+               strlcat(options,",prefixpath=",options_size);
+               strlcat(options,prefixpath,options_size); /* no need to cat the / */
+       }
+
+       /* convert all '\\' to '/' in share portion so that /proc/mounts looks pretty */
+       replace_char(dev_name, '\\', '/', strlen(share_name));
+
+       if (!got_ip && addr) {
+               strlcat(options, ",ip=", options_size);
+               current_len = strnlen(options, options_size);
+               optionstail = options + current_len;
+               switch (addr->ai_addr->sa_family) {
+               case AF_INET6:
+                       addr6 = (struct sockaddr_in6 *) addr->ai_addr;
+                       ipaddr = inet_ntop(AF_INET6, &addr6->sin6_addr, optionstail,
+                                          options_size - current_len);
+                       break;
+               case AF_INET:
+                       addr4 = (struct sockaddr_in *) addr->ai_addr;
+                       ipaddr = inet_ntop(AF_INET, &addr4->sin_addr, optionstail,
+                                          options_size - current_len);
+                       break;
+               default:
+                       ipaddr = NULL;
+               }
+
+               /* if the address looks bogus, try the next one */
+               if (!ipaddr) {
+                       addr = addr->ai_next;
+                       if (addr)
+                               goto mount_retry;
+                       rc = EX_SYSERR;
+                       goto mount_exit;
+               }
+       }
+
+       if (addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) {
+               strlcat(options, "%", options_size);
+               current_len = strnlen(options, options_size);
+               optionstail = options + current_len;
+               snprintf(optionstail, options_size - current_len, "%u",
+                        addr6->sin6_scope_id);
+       }
+
+       if(verboseflag)
+               fprintf(stderr, "\nmount.cifs kernel mount options: %s", options);
+
+       if (mountpassword) {
+               /*
+                * Commas have to be doubled, or else they will
+                * look like the parameter separator
+                */
+               if(retry == 0)
+                       check_for_comma(&mountpassword);
+               strlcat(options,",pass=",options_size);
+               strlcat(options,mountpassword,options_size);
+               if (verboseflag)
+                       fprintf(stderr, ",pass=********");
+       }
+
+       if (verboseflag)
+               fprintf(stderr, "\n");
+
+       rc = check_mtab(thisprogram, dev_name, mountpoint);
+       if (rc)
+               goto mount_exit;
+
+       if (!fakemnt && mount(dev_name, ".", cifs_fstype, flags, options)) {
+               switch (errno) {
+               case ECONNREFUSED:
+               case EHOSTUNREACH:
+                       if (addr) {
+                               addr = addr->ai_next;
+                               if (addr)
+                                       goto mount_retry;
+                       }
+                       break;
+               case ENODEV:
+                       fprintf(stderr, "mount error: cifs filesystem not supported by the system\n");
+                       break;
+               case ENXIO:
+                       if(retry == 0) {
+                               retry = 1;
+                               if (uppercase_string(dev_name) &&
+                                   uppercase_string(share_name) &&
+                                   uppercase_string(prefixpath)) {
+                                       fprintf(stderr, "retrying with upper case share name\n");
+                                       goto mount_retry;
+                               }
+                       }
+               }
+               fprintf(stderr, "mount error(%d): %s\n", errno, strerror(errno));
+               fprintf(stderr, "Refer to the mount.cifs(8) manual page (e.g. man "
+                      "mount.cifs)\n");
+               rc = EX_FAIL;
+               goto mount_exit;
+       }
+
+       if (nomtab)
+               goto mount_exit;
+       atexit(unlock_mtab);
+       rc = lock_mtab();
+       if (rc) {
+               fprintf(stderr, "cannot lock mtab");
+               goto mount_exit;
+       }
+       pmntfile = setmntent(MOUNTED, "a+");
+       if (!pmntfile) {
+               fprintf(stderr, "could not update mount table\n");
+               unlock_mtab();
+               rc = EX_FILEIO;
+               goto mount_exit;
+       }
+       mountent.mnt_fsname = dev_name;
+       mountent.mnt_dir = mountpoint;
+       mountent.mnt_type = (char *)(void *)cifs_fstype;
+       mountent.mnt_opts = (char *)malloc(220);
+       if(mountent.mnt_opts) {
+               char * mount_user = getusername();
+               memset(mountent.mnt_opts,0,200);
+               if(flags & MS_RDONLY)
+                       strlcat(mountent.mnt_opts,"ro",220);
+               else
+                       strlcat(mountent.mnt_opts,"rw",220);
+               if(flags & MS_MANDLOCK)
+                       strlcat(mountent.mnt_opts,",mand",220);
+               if(flags & MS_NOEXEC)
+                       strlcat(mountent.mnt_opts,",noexec",220);
+               if(flags & MS_NOSUID)
+                       strlcat(mountent.mnt_opts,",nosuid",220);
+               if(flags & MS_NODEV)
+                       strlcat(mountent.mnt_opts,",nodev",220);
+               if(flags & MS_SYNCHRONOUS)
+                       strlcat(mountent.mnt_opts,",sync",220);
+               if(mount_user) {
+                       if(getuid() != 0) {
+                               strlcat(mountent.mnt_opts,
+                                       ",user=", 220);
+                               strlcat(mountent.mnt_opts,
+                                       mount_user, 220);
+                       }
+               }
+       }
+       mountent.mnt_freq = 0;
+       mountent.mnt_passno = 0;
+       rc = addmntent(pmntfile,&mountent);
+       endmntent(pmntfile);
+       unlock_mtab();
+       SAFE_FREE(mountent.mnt_opts);
+       if (rc)
+               rc = EX_FILEIO;
+mount_exit:
+       if(mountpassword) {
+               int len = strlen(mountpassword);
+               memset(mountpassword,0,len);
+               SAFE_FREE(mountpassword);
+       }
+
+       if (addrhead)
+               freeaddrinfo(addrhead);
+       SAFE_FREE(options);
+       SAFE_FREE(orgoptions);
+       SAFE_FREE(resolved_path);
+       SAFE_FREE(share_name);
+       exit(rc);
+}
diff --git a/mount.h b/mount.h
new file mode 100644 (file)
index 0000000..23ea4f0
--- /dev/null
+++ b/mount.h
@@ -0,0 +1,38 @@
+/* 
+ * Copyright (C) 2008 Jeff Layton (jlayton@samba.org)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ * * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* most of this info was taken from the util-linux-ng sources */
+
+#ifndef _MOUNT_H_
+#define _MOUNT_H_
+
+/* exit status - bits below are ORed */
+#define EX_USAGE       1       /* incorrect invocation or permission */
+#define EX_SYSERR      2       /* out of memory, cannot fork, ... */
+#define EX_SOFTWARE    4       /* internal mount bug or wrong version */
+#define EX_USER                8       /* user interrupt */
+#define EX_FILEIO      16      /* problems writing, locking, ... mtab/fstab */
+#define EX_FAIL               32       /* mount failure */
+#define EX_SOMEOK      64      /* some mount succeeded */
+
+#define _PATH_MOUNTED_LOCK     _PATH_MOUNTED "~"
+#define _PATH_MOUNTED_TMP      _PATH_MOUNTED ".tmp"
+
+extern int lock_mtab(void);
+extern void unlock_mtab(void);
+
+#endif /* ! _MOUNT_H_ */
diff --git a/mtab.c b/mtab.c
new file mode 100644 (file)
index 0000000..70789bc
--- /dev/null
+++ b/mtab.c
@@ -0,0 +1,220 @@
+/*
+ * mtab locking routines for use with mount.cifs and umount.cifs
+ * Copyright (C) 2008 Jeff Layton (jlayton@samba.org)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+ * This code was copied from the util-linux-ng sources and modified:
+ *
+ * git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git
+ *
+ * ...specifically from mount/fstab.c. That file has no explicit license. The
+ * "default" license for anything in that tree is apparently GPLv2+, so I
+ * believe we're OK to copy it here.
+ *
+ * Jeff Layton <jlayton@samba.org> 
+ */
+
+#include <unistd.h>
+#include <errno.h>
+#include <stdio.h>
+#include <sys/time.h>
+#include <sys/stat.h>
+#include <time.h>
+#include <fcntl.h>
+#include <mntent.h>
+#include <stdlib.h>
+#include <signal.h>
+#include "mount.h"
+
+
+/* Updating mtab ----------------------------------------------*/
+
+/* Flag for already existing lock file. */
+static int we_created_lockfile = 0;
+static int lockfile_fd = -1;
+
+/* Flag to indicate that signals have been set up. */
+static int signals_have_been_setup = 0;
+
+static void
+handler (int sig) {
+     exit(EX_USER);
+}
+
+static void
+setlkw_timeout (int sig) {
+     /* nothing, fcntl will fail anyway */
+}
+
+/* Remove lock file.  */
+void
+unlock_mtab (void) {
+       if (we_created_lockfile) {
+               close(lockfile_fd);
+               lockfile_fd = -1;
+               unlink (_PATH_MOUNTED_LOCK);
+               we_created_lockfile = 0;
+       }
+}
+
+/* Create the lock file.
+   The lock file will be removed if we catch a signal or when we exit. */
+/* The old code here used flock on a lock file /etc/mtab~ and deleted
+   this lock file afterwards. However, as rgooch remarks, that has a
+   race: a second mount may be waiting on the lock and proceed as
+   soon as the lock file is deleted by the first mount, and immediately
+   afterwards a third mount comes, creates a new /etc/mtab~, applies
+   flock to that, and also proceeds, so that the second and third mount
+   now both are scribbling in /etc/mtab.
+   The new code uses a link() instead of a creat(), where we proceed
+   only if it was us that created the lock, and hence we always have
+   to delete the lock afterwards. Now the use of flock() is in principle
+   superfluous, but avoids an arbitrary sleep(). */
+
+/* Where does the link point to? Obvious choices are mtab and mtab~~.
+   HJLu points out that the latter leads to races. Right now we use
+   mtab~.<pid> instead. Use 20 as upper bound for the length of %d. */
+#define MOUNTLOCK_LINKTARGET           _PATH_MOUNTED_LOCK "%d"
+#define MOUNTLOCK_LINKTARGET_LTH       (sizeof(_PATH_MOUNTED_LOCK)+20)
+
+/*
+ * The original mount locking code has used sleep(1) between attempts and
+ * maximal number of attemps has been 5.
+ *
+ * There was very small number of attempts and extremely long waiting (1s)
+ * that is useless on machines with large number of concurret mount processes.
+ *
+ * Now we wait few thousand microseconds between attempts and we have global
+ * time limit (30s) rather than limit for number of attempts. The advantage
+ * is that this method also counts time which we spend in fcntl(F_SETLKW) and
+ * number of attempts is not so much restricted.
+ *
+ * -- kzak@redhat.com [2007-Mar-2007]
+ */
+
+/* maximum seconds between first and last attempt */
+#define MOUNTLOCK_MAXTIME              30
+
+/* sleep time (in microseconds, max=999999) between attempts */
+#define MOUNTLOCK_WAITTIME             5000
+
+int
+lock_mtab (void) {
+       int i;
+       struct timespec waittime;
+       struct timeval maxtime;
+       char linktargetfile[MOUNTLOCK_LINKTARGET_LTH];
+
+       if (!signals_have_been_setup) {
+               int sig = 0;
+               struct sigaction sa;
+
+               sa.sa_handler = handler;
+               sa.sa_flags = 0;
+               sigfillset (&sa.sa_mask);
+
+               while (sigismember (&sa.sa_mask, ++sig) != -1
+                      && sig != SIGCHLD) {
+                       if (sig == SIGALRM)
+                               sa.sa_handler = setlkw_timeout;
+                       else
+                               sa.sa_handler = handler;
+                       sigaction (sig, &sa, (struct sigaction *) 0);
+               }
+               signals_have_been_setup = 1;
+       }
+
+       sprintf(linktargetfile, MOUNTLOCK_LINKTARGET, getpid ());
+
+       i = open (linktargetfile, O_WRONLY|O_CREAT, S_IRUSR|S_IWUSR);
+       if (i < 0) {
+               /* linktargetfile does not exist (as a file)
+                  and we cannot create it. Read-only filesystem?
+                  Too many files open in the system?
+                  Filesystem full? */
+               return EX_FILEIO;
+       }
+       close(i);
+
+       gettimeofday(&maxtime, NULL);
+       maxtime.tv_sec += MOUNTLOCK_MAXTIME;
+
+       waittime.tv_sec = 0;
+       waittime.tv_nsec = (1000 * MOUNTLOCK_WAITTIME);
+
+       /* Repeat until it was us who made the link */
+       while (!we_created_lockfile) {
+               struct timeval now;
+               struct flock flock;
+               int errsv, j;
+
+               j = link(linktargetfile, _PATH_MOUNTED_LOCK);
+               errsv = errno;
+
+               if (j == 0)
+                       we_created_lockfile = 1;
+
+               if (j < 0 && errsv != EEXIST) {
+                       (void) unlink(linktargetfile);
+                       return EX_FILEIO;
+               }
+
+               lockfile_fd = open (_PATH_MOUNTED_LOCK, O_WRONLY);
+
+               if (lockfile_fd < 0) {
+                       /* Strange... Maybe the file was just deleted? */
+                       gettimeofday(&now, NULL);
+                       if (errno == ENOENT && now.tv_sec < maxtime.tv_sec) {
+                               we_created_lockfile = 0;
+                               continue;
+                       }
+                       (void) unlink(linktargetfile);
+                       return EX_FILEIO;
+               }
+
+               flock.l_type = F_WRLCK;
+               flock.l_whence = SEEK_SET;
+               flock.l_start = 0;
+               flock.l_len = 0;
+
+               if (j == 0) {
+                       /* We made the link. Now claim the lock. If we can't
+                        * get it, continue anyway
+                        */
+                       fcntl (lockfile_fd, F_SETLK, &flock);
+                       (void) unlink(linktargetfile);
+               } else {
+                       /* Someone else made the link. Wait. */
+                       gettimeofday(&now, NULL);
+                       if (now.tv_sec < maxtime.tv_sec) {
+                               alarm(maxtime.tv_sec - now.tv_sec);
+                               if (fcntl (lockfile_fd, F_SETLKW, &flock) == -1) {
+                                       (void) unlink(linktargetfile);
+                                       return EX_FILEIO;
+                               }
+                               alarm(0);
+                               nanosleep(&waittime, NULL);
+                       } else {
+                               (void) unlink(linktargetfile);
+                               return EX_FILEIO;
+                       }
+                       close(lockfile_fd);
+               }
+       }
+       return 0;
+}
+