← Back to branch summary

~john-koepi/ubuntu/precise/memcached/default

« back to all changes in this revision

Viewing changes to memcached.c

  • Committer: Clint Byrum
  • Date: 2012-02-09 22:03:23 UTC
  • mfrom: (1.1.12)
  • Revision ID: clint@ubuntu.com-20120209220323-kj4m7svz40kfhcmm
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
memcached.c
1604
1604
 
1605
1605
    if (!c->sasl_conn) {
1606
1606
        int result=sasl_server_new("memcached",
1607
 
                                   NULL, NULL, NULL, NULL,
 
1607
                                   NULL,
 
1608
                                   my_sasl_hostname[0] ? my_sasl_hostname : NULL,
 
1609
                                   NULL, NULL,
1608
1610
                                   NULL, 0, &c->sasl_conn);
1609
1611
        if (result != SASL_OK) {
1610
1612
            if (settings.verbose) {
3329
3331
 
3330
3332
        conn_set_state(c, conn_closing);
3331
3333
 
3332
 
    } else if (strcmp(tokens[COMMAND_TOKEN].value, "slabs") == 0) {
 
3334
    } else if (ntokens > 1 && strcmp(tokens[COMMAND_TOKEN].value, "slabs") == 0) {
3333
3335
        if (ntokens == 5 && strcmp(tokens[COMMAND_TOKEN + 1].value, "reassign") == 0) {
3334
3336
            int src, dst, rv;
3335
3337