← Back to branch summary

~ubuntu-branches/ubuntu/vivid/samba/vivid

« back to all changes in this revision

Viewing changes to libcli/ldap/ldap_message.c

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2011-12-21 13:18:04 UTC
  • mfrom: (0.39.21 sid)
  • Revision ID: package-import@ubuntu.com-20111221131804-xtlr39wx6njehxxr
Tags: 2:3.6.1-3ubuntu1
* Merge from Debian testing.  Remaining changes:
  + debian/patches/VERSION.patch:
    - set SAMBA_VERSION_SUFFIX to Ubuntu.
  + debian/patches/error-trans.fix-276472:
    - Add the translation of Unix Error code -ENOTSUP to NT Error Code
    - NT_STATUS_NOT_SUPPORTED to prevent the Permission denied error.
  + debian/smb.conf:
    - add "(Samba, Ubuntu)" to server string.
    - comment out the default [homes] share, and add a comment about
      "valid users = %S" to show users how to restrict access to
      \\server\username to only username.
    - Set 'usershare allow guests', so that usershare admins are 
      allowed to create public shares in addition to authenticated
      ones.
    - add map to guest = Bad user, maps bad username to guest access.
  + debian/samba-common.config:
    - Do not change priority to high if dhclient3 is installed.
    - Use priority medium instead of high for the workgroup question.
  + debian/control:
    - Don't build against or suggest ctdb.
    - Add dependency on samba-common-bin to samba.
  + Add ufw integration:
    - Created debian/samba.ufw.profile
    - debian/rules, debian/samba.dirs, debian/samba.files: install
      profile
    - debian/control: have samba suggest ufw
  + Add apport hook:
    - Created debian/source_samba.py.
    - debian/rules, debian/samba.dirs, debian/samba-common-bin.files: install
  + Switch to upstart:
    - Add debian/samba.{nmbd,smbd}.upstart.
  + debian/samba.logrotate, debian/samba-common.dhcp, debian/samba.if-up:
    - Make them upstart compatible
  + debian/samba.postinst: 
    - Avoid scary pdbedit warnings on first import.
  + debian/samba-common.postinst: Add more informative error message for
    the case where smb.conf was manually deleted
  + debian/patches/fix-debuglevel-name-conflict.patch: don't use 'debug_level'
    as a global variable name in an NSS module 
  + Dropped:
    - debian/patches/error-trans.fix-276472
    - debian/patches/fix-debuglevel-name-conflict.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
libcli/ldap/ldap_message.c
167
167
        }
168
168
 
169
169
        for (i = 0; handlers[i].oid != NULL; i++) {
 
170
                if (!ctrl->oid) {
 
171
                        /* not encoding this control, the OID has been
 
172
                         * set to NULL indicating it isn't really
 
173
                         * here */
 
174
                        return true;
 
175
                }
170
176
                if (strcmp(handlers[i].oid, ctrl->oid) == 0) {
171
177
                        if (!handlers[i].encode) {
172
178
                                if (ctrl->critical) {
434
440
        }
435
441
        case LDAP_TAG_UnbindRequest: {
436
442
/*              struct ldap_UnbindRequest *r = &msg->r.UnbindRequest; */
 
443
                asn1_push_tag(data, ASN1_APPLICATION_SIMPLE(msg->type));
 
444
                asn1_pop_tag(data);
437
445
                break;
438
446
        }
439
447
        case LDAP_TAG_SearchRequest: {
668
676
                        if (!ldap_encode_control(mem_ctx, data,
669
677
                                                 control_handlers,
670
678
                                                 msg->controls[i])) {
 
679
                                DEBUG(1,("Unable to encode control %s\n",
 
680
                                         msg->controls[i]->oid));
671
681
                                return false;
672
682
                        }
673
683
                }
1607
1617
*/
1608
1618
NTSTATUS ldap_full_packet(void *private_data, DATA_BLOB blob, size_t *packet_size)
1609
1619
{
1610
 
        return asn1_full_tag(blob, ASN1_SEQUENCE(0), packet_size);
 
1620
        if (blob.length < 6) {
 
1621
                /*
 
1622
                 * We need at least 6 bytes to workout the length
 
1623
                 * of the pdu.
 
1624
                 */
 
1625
                return STATUS_MORE_ENTRIES;
 
1626
        }
 
1627
        return asn1_peek_full_tag(blob, ASN1_SEQUENCE(0), packet_size);
1611
1628
}