Fixed the conflict after merged #1600.

src/bin/auth/auth_srv.cc

@@ -566,18 +566,18 @@ AuthSrvImpl::processNormalQuery(const IOMessage& io_message, Message& message,
     }
 
     renderer_.clear();
-    renderer_.setBuffer(buffer.get());
+    renderer_.setBuffer(&buffer);
     
     const bool udp_buffer =
         (io_message.getSocket().getProtocol() == IPPROTO_UDP);
     renderer_.setLengthLimit(udp_buffer ? remote_bufsize : 65535);
     if (tsig_context.get() != NULL) {
-        message->toWire(renderer_, *tsig_context);
+        message.toWire(renderer_, *tsig_context);
     } else {
-        message->toWire(renderer_);
+        message.toWire(renderer_);
     }
     LOG_DEBUG(auth_logger, DBG_AUTH_MESSAGES, AUTH_SEND_NORMAL_RESPONSE)
-              .arg(renderer_.getLength()).arg(message->toText());
+              .arg(renderer_.getLength()).arg(message.toText());
     return (true);
 }
 
@@ -696,11 +696,11 @@ AuthSrvImpl::processNotify(const IOMessage& io_message, Message& message,
     message.setRcode(Rcode::NOERROR());
 
     renderer_.clear();
-    renderer_.setBuffer(buffer.get());
+    renderer_.setBuffer(&buffer);
     if (tsig_context.get() != NULL) {
-        message->toWire(renderer_, *tsig_context);
+        message.toWire(renderer_, *tsig_context);
     } else {
-        message->toWire(renderer_);
+        message.toWire(renderer_);
     }
     return (true);
 }

src/bin/auth/tests/auth_srv_unittest.cc

@@ -125,8 +125,6 @@ protected:
         }
     }
 
-<<<<<<< HEAD
-=======
     // Convenience method for tests that expect to return SERVFAIL
     // It calls processMessage, checks if there is an answer, and
     // check the header for default SERVFAIL data
@@ -137,7 +135,6 @@ protected:
                     opcode.getCode(), QR_FLAG, 1, 0, 0, 0);
     }
 
->>>>>>> master
     IOService ios_;
     DNSService dnss_;
     MockSession statistics_session;
@@ -1078,7 +1075,6 @@ TEST_F(AuthSrvTest, listenAddresses) {
                                 "Released tokens");
 }
 
-<<<<<<< HEAD
 TEST_F(AuthSrvTest, processNormalQuery_reuseRenderer1) {
     UnitTestUtil::createRequestMessage(request_message, Opcode::QUERY(),
                                        default_qid, Name("example.com"),
@@ -1086,7 +1082,7 @@ TEST_F(AuthSrvTest, processNormalQuery_reuseRenderer1) {
     
     request_message.setHeaderFlag(Message::HEADERFLAG_AA);
     createRequestPacket(request_message, IPPROTO_UDP);
-    server.processMessage(*io_message, parse_message, response_obuffer, &dnsserv);
+    server.processMessage(*io_message, *parse_message, *response_obuffer, &dnsserv);
     EXPECT_NE(request_message.getRcode(), parse_message->getRcode());
 }
 
@@ -1097,10 +1093,10 @@ TEST_F(AuthSrvTest, processNormalQuery_reuseRenderer2) {
     
     request_message.setHeaderFlag(Message::HEADERFLAG_AA);
     createRequestPacket(request_message, IPPROTO_UDP);
-    server.processMessage(*io_message, parse_message, response_obuffer, &dnsserv);
+    server.processMessage(*io_message, *parse_message, *response_obuffer, &dnsserv);
     ConstQuestionPtr question = *parse_message->beginQuestion();
     EXPECT_STRNE(question->getType().toText().c_str(),RRType::NS().toText().c_str());
-=======
+}
 //
 // Tests for catching exceptions in various stages of the query processing
 //
@@ -1326,7 +1322,6 @@ TEST_F(AuthSrvTest, queryWithInMemoryClientProxyGetClass) {
     EXPECT_TRUE(dnsserv.hasAnswer());
     headerCheck(*parse_message, default_qid, Rcode::NOERROR(),
                 opcode.getCode(), QR_FLAG | AA_FLAG, 1, 1, 2, 1);
->>>>>>> master
 }
 
 }