BIND 10 master, updated. bef9fc00a6c4e6c45922848d7f220ed262e83b1f Merge branch 'master' of git+ssh://bind10.isc.org/var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  bef9fc00a6c4e6c45922848d7f220ed262e83b1f (commit)
       via  d622e35a3d7b378f79dc4d587156cbfec3befed9 (commit)
      from  433ef14c7c54f255b302ff74213a24bdc298f2a0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bef9fc00a6c4e6c45922848d7f220ed262e83b1f
Merge: d622e35a3d7b378f79dc4d587156cbfec3befed9 433ef14c7c54f255b302ff74213a24bdc298f2a0
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Thu Apr 7 20:41:56 2011 +0200

    Merge branch 'master' of git+ssh://bind10.isc.org/var/bind10/git/bind10

commit d622e35a3d7b378f79dc4d587156cbfec3befed9
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Thu Apr 7 20:40:48 2011 +0200

    [master] Adapt new function after merge
    
    This function was introduced after the branch was created, but the
    changes are the same as with other functions - pushing directly.

-----------------------------------------------------------------------

Summary of changes:
 src/lib/dns/buffer.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/dns/buffer.h b/src/lib/dns/buffer.h
index c451f1b..6fbbdb1 100644
--- a/src/lib/dns/buffer.h
+++ b/src/lib/dns/buffer.h
@@ -416,10 +416,10 @@ public:
     /// \param data The 8-bit integer to be written into the buffer.
     /// \param pos The position in the buffer to write the data.
     void writeUint8At(uint8_t data, size_t pos) {
-        if (pos + sizeof(data) > data_.size()) {
+        if (pos + sizeof(data) > size_) {
             isc_throw(InvalidBufferPosition, "write at invalid position");
         }
-        data_[pos] = data;
+        buffer_[pos] = data;
     }
 
     /// \brief Write an unsigned 16-bit integer in host byte order into the