X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/f5c0ab925fdceb1bc0ef0e958cae7d0fafb28caf..b49068c566d749130e023536d54588c948c16edf:/cmdline/apt-helper.cc

diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc
index d235ac315..dc4efb32b 100644
--- a/cmdline/apt-helper.cc
+++ b/cmdline/apt-helper.cc
@@ -68,9 +68,6 @@ static bool DoDownloadFile(CommandLine &CmdL)
       fileind += 3;
    }
 
-   // Disable drop-privs if "_apt" can not write to the target dir
-   CheckDropPrivsMustBeDisabled(Fetcher);
-
    bool Failed = false;
    if (AcquireRun(Fetcher, 0, &Failed, NULL) == false || Failed == true)
       return _error->Error(_("Download Failed"));
@@ -84,26 +81,28 @@ static bool DoDownloadFile(CommandLine &CmdL)
 
 static bool DoSrvLookup(CommandLine &CmdL)
 {
-   if (CmdL.FileSize() < 1)
-      return _error->Error(_("Must specifc at least one srv record"));
+   if (CmdL.FileSize() <= 1)
+      return _error->Error("Must specify at least one SRV record");
 
-   std::vector<SrvRec> srv_records;
-   c1out << "# target priority weight port" << std::endl;
-   for(int i=1; CmdL.FileList[i] != NULL; i++)
+   for(size_t i = 1; CmdL.FileList[i] != NULL; ++i)
    {
-      if(GetSrvRecords(CmdL.FileList[i], srv_records) == false)
-         _error->Warning(_("GetSrvRec failed for %s"), CmdL.FileList[i]);
-      for (std::vector<SrvRec>::const_iterator I = srv_records.begin();
-           I != srv_records.end(); ++I)
+      std::vector<SrvRec> srv_records;
+      std::string const name = CmdL.FileList[i];
+      c0out << "# Target\tPriority\tWeight\tPort # for " << name << std::endl;
+      size_t const found = name.find(":");
+      if (found != std::string::npos)
       {
-         c1out << (*I).target.c_str() << " "
-               << (*I).priority << " "
-               << (*I).weight << " "
-               << (*I).port << " "
-               << std::endl;
+	 std::string const host = name.substr(0, found);
+	 size_t const port = atoi(name.c_str() + found + 1);
+	 if(GetSrvRecords(host, port, srv_records) == false)
+	    _error->Error(_("GetSrvRec failed for %s"), name.c_str());
       }
-   }
+      else if(GetSrvRecords(name, srv_records) == false)
+	 _error->Error(_("GetSrvRec failed for %s"), name.c_str());
 
+      for (SrvRec const &I : srv_records)
+	 c1out << I.target << "\t" << I.priority << "\t" << I.weight << "\t" << I.port << std::endl;
+   }
    return true;
 }