← Back to branch summary

~ubuntu-branches/ubuntu/precise/ceph/precise

« back to all changes in this revision

Viewing changes to src/auth/ExportControl.cc

  • Committer: Bazaar Package Importer
  • Author(s): Clint Byrum, Clint Byrum, Micah Gersten
  • Date: 2011-02-12 22:50:26 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20110212225026-yyyw4tk0msgql3ul
Tags: 0.24.2-0ubuntu1
https://launchpad.net/bugs/658670
https://launchpad.net/bugs/684011
[ Clint Byrum <clint@ubuntu.com> ]
* New upstream release. (LP: #658670, LP: #684011)
* debian/patches/fix-mkcephfs.patch: dropped (applied upstream)
* Removed .la files from libceph1-dev, libcrush1-dev and 
  librados1-dev (per Debian policy v3.9.1 10.2).
* debian/control: adding pkg-config as a build dependency
* debian/control: depend on libcrypto++-dev instead of libssl-dev
* debian/watch: added watch file

[ Micah Gersten <micahg@ubuntu.com> ]
* debian/control: add Homepage

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/auth/ExportControl.cc
82
82
{
83
83
        unsigned char ip[4], mask[4];
84
84
 
85
 
        char *mask_str = strdup(str);
 
85
        char mask_str[strlen(str)+1];
 
86
        strcpy(mask_str, str);
86
87
        int ret;
87
88
 
88
89
        dout(30) << "Subnet::parse str=" << str << dendl;
323
324
                   one and exit */
324
325
                group = new GroupEntry(subnet);
325
326
                subnet = NULL;
326
 
                groups_map[strdup(group_name)] = group;
 
327
                groups_map[group_name] = group;
327
328
                goto done;
328
329
        }
329
330
 
331
332
        if (iter == groups_map.end() ) {
332
333
                orig_group = new GroupEntry(subnet);
333
334
                subnet = NULL;
334
 
                groups_map[strdup(group_name)] = orig_group;
 
335
                groups_map[group_name] = orig_group;
335
336
        } else {
336
337
                orig_group = iter->second;
337
338
        }
616
617
                        free(allow_str);
617
618
                }
618
619
        }
619
 
 
 
620
        delete allow_def;
620
621
        free(orig_tmp_sec);
621
622
    } else if ((strncmp(GROUP_SEC_NAME, (*p)->get_name().c_str(), grp_len) == 0) ||
622
623
        (strncmp(CLIENT_SEC_NAME, (*p)->get_name().c_str(), client_len) == 0)) {