Changeset 134 for branches/samba-3.0/source/libads

Timestamp:

May 23, 2008, 6:56:41 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.29

Location:

branches/samba-3.0/source/libads

Files:

• dns.c (modified) (7 diffs)
• kerberos_verify.c (modified) (1 diff)
• ldap.c (modified) (2 diffs)

branches/samba-3.0/source/libads/dns.c

@@ -196 +196 @@
                 return False;
         }
+
         srv->hostname = talloc_strdup( ctx, dcname );
+
+        DEBUG(10,("ads_dns_parse_rr_srv: Parsed %s [%u, %u, %u]\n", 
+                  srv->hostname, 
+                  srv->priority,
+                  srv->weight,
+                  srv->port));
 
         return True;
@@ -275 +282 @@
 {
         uint8 *buffer = NULL;
-        size_t buf_len;
+        size_t buf_len = 0;
         int resp_len = NS_PACKETSZ;     
         
@@ -304 +311 @@
                         return NT_STATUS_UNSUCCESSFUL;
                 }
-        } while ( buf_len < resp_len && resp_len < MAX_DNS_PACKET_SIZE );
-        
+
+                /* On AIX, Solaris, and possibly some older glibc systems (e.g. SLES8)
+                   truncated replies never give back a resp_len > buflen
+                   which ends up causing DNS resolve failures on large tcp DNS replies */
+
+                if (buf_len == resp_len) {
+                        if (resp_len == MAX_DNS_PACKET_SIZE) {
+                                DEBUG(1,("dns_send_req: DNS reply too large when resolving %s\n",
+                                        name));
+                                TALLOC_FREE( buffer );
+                                return NT_STATUS_BUFFER_TOO_SMALL;
+                        }
+
+                        resp_len = MIN(resp_len*2, MAX_DNS_PACKET_SIZE);
+                }
+
+
+        } while ( buf_len < resp_len && resp_len <= MAX_DNS_PACKET_SIZE );
+
         *buf = buffer;
         *resp_length = resp_len;
@@ -375 +399 @@
                 struct dns_query q;
 
-                if ( !ads_dns_parse_query( ctx, buffer, buffer+resp_len, &p, &q ) ) {
-                        DEBUG(1,("ads_dns_lookup_srv: Failed to parse query record!\n"));
+                if (!ads_dns_parse_query(ctx, buffer,
+                                        buffer+resp_len, &p, &q)) {
+                        DEBUG(1,("ads_dns_lookup_srv: "
+                                 "Failed to parse query record [%d]!\n", rrnum));
                         return NT_STATUS_UNSUCCESSFUL;
                 }
@@ -384 +410 @@
 
         for ( rrnum=0; rrnum<answer_count; rrnum++ ) {
-                if ( !ads_dns_parse_rr_srv( ctx, buffer, buffer+resp_len, &p, &dcs[rrnum] ) ) {
-                        DEBUG(1,("ads_dns_lookup_srv: Failed to parse answer record!\n"));
+                if (!ads_dns_parse_rr_srv(ctx, buffer, buffer+resp_len,
+                                        &p, &dcs[rrnum])) {
+                        DEBUG(1,("ads_dns_lookup_srv: "
+                                 "Failed to parse answer recordi [%d]!\n", rrnum));
                         return NT_STATUS_UNSUCCESSFUL;
                 }               
@@ -397 +425 @@
                 struct dns_rr rr;
 
-                if ( !ads_dns_parse_rr( ctx, buffer, buffer+resp_len, &p, &rr ) ) {
-                        DEBUG(1,("ads_dns_lookup_srv: Failed to parse authority record!\n"));
+                if (!ads_dns_parse_rr( ctx, buffer,
+                                        buffer+resp_len, &p, &rr)) {
+                        DEBUG(1,("ads_dns_lookup_srv: "
+                                 "Failed to parse authority record! [%d]\n", rrnum));
                         return NT_STATUS_UNSUCCESSFUL;
                 }
@@ -409 +439 @@
                 int i;
 
-                if ( !ads_dns_parse_rr( ctx, buffer, buffer+resp_len, &p, &rr ) ) {
-                        DEBUG(1,("ads_dns_lookup_srv: Failed to parse additional records section!\n"));
+                if (!ads_dns_parse_rr(ctx, buffer, buffer+resp_len,
+                                        &p, &rr)) {
+                        DEBUG(1,("ads_dns_lookup_srv: Failed "
+                                 "to parse additional records section! [%d]\n", rrnum));
                         return NT_STATUS_UNSUCCESSFUL;
                 }

branches/samba-3.0/source/libads/kerberos_verify.c

@@ -129 +129 @@
                                 * as krb5_ktfile_get_entry will explicitly
                                 * close the krb5_keytab as soon as krb5_rd_req
-                                * has sucessfully decrypted the ticket but the
+                                * has successfully decrypted the ticket but the
                                 * ticket is not valid yet (due to clockskew)
                                 * there is no point in querying more keytab

branches/samba-3.0/source/libads/ldap.c

@@ -789 +789 @@
                 /* this relies on the way that ldap_add_result_entry() works internally. I hope
                    that this works on all ldap libs, but I have only tested with openldap */
-                for (msg = ads_first_entry(ads, res2); msg; msg = next) {
-                        next = ads_next_entry(ads, msg);
+                for (msg = ads_first_message(ads, res2); msg; msg = next) {
+                        next = ads_next_message(ads, msg);
                         ldap_add_result_entry((LDAPMessage **)res, msg);
                 }
@@ -1924 +1924 @@
 
 /**
+ * pull the first message from a ADS result
+ * @param ads connection to ads server
+ * @param res Results of search
+ * @return first message from result
+ **/
+ LDAPMessage *ads_first_message(ADS_STRUCT *ads, LDAPMessage *res)
+{
+        return ldap_first_message(ads->ld, res);
+}
+
+/**
+ * pull the next message from a ADS result
+ * @param ads connection to ads server
+ * @param res Results of search
+ * @return next message from result
+ **/
+ LDAPMessage *ads_next_message(ADS_STRUCT *ads, LDAPMessage *res)
+{
+        return ldap_next_message(ads->ld, res);
+}
+
+/**
  * pull a single string from a ADS result
  * @param ads connection to ads server