Changeset 56319 in vbox
- Timestamp:
- Jun 9, 2015 10:55:53 PM (10 years ago)
- svn:sync-xref-src-repo-rev:
- 100906
- Location:
- trunk/src/VBox/Main
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/include/DHCPServerImpl.h
r54407 r56319 93 93 private: 94 94 HRESULT encodeOption(com::Utf8Str &aEncoded, 95 95 uint32_t aOptCode, const DhcpOptValue &aOptValue); 96 96 int addOption(DhcpOptionMap &aMap, 97 97 DhcpOpt_T aOption, const com::Utf8Str &aValue); 98 98 99 99 // wrapped IDHCPServer properties -
trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp
r56273 r56319 846 846 } 847 847 } 848 848 849 849 if (GetFileVersionInfo(pszDrv, NULL, cbVerInfo, pVerInfo)) 850 850 { -
trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp
r56030 r56319 2444 2444 if ((pszSuff = RTPathSuffix(strTargetPath->c_str()))!=NULL) 2445 2445 { 2446 /* 2446 /* 2447 2447 * Figure out which format the user like to have. Default is VMDK 2448 2448 * or it can be VDI if according command-line option is set -
trunk/src/VBox/Main/src-server/HostDnsService.cpp
r55797 r56319 52 52 std::set<std::string> l(servers.begin(), servers.end()); 53 53 std::set<std::string> r(info.servers.begin(), info.servers.end()); 54 54 55 55 fSameServers = (l == r); 56 56 } -
trunk/src/VBox/Main/src-server/HostDnsService.h
r55797 r56319 186 186 ~HostDnsServiceSolaris(){} 187 187 virtual HRESULT init(VirtualBox *virtualbox) { 188 188 return HostDnsServiceResolvConf::init(virtualbox, "/etc/resolv.conf"); 189 189 } 190 190 }; … … 197 197 virtual ~HostDnsServiceLinux(); 198 198 virtual HRESULT init(VirtualBox *virtualbox) { 199 199 return HostDnsServiceResolvConf::init(virtualbox, "/etc/resolv.conf"); 200 200 } 201 201 … … 212 212 ~HostDnsServiceFreebsd(){} 213 213 virtual HRESULT init(VirtualBox *virtualbox) { 214 214 return HostDnsServiceResolvConf::init(virtualbox, "/etc/resolv.conf"); 215 215 } 216 216 }; … … 224 224 /* XXX: \\MPTN\\ETC should be taken from environment variable ETC */ 225 225 virtual HRESULT init(VirtualBox *virtualbox) { 226 226 return HostDnsServiceResolvConf::init(virtualbox, "\\MPTN\\ETC\\RESOLV2"); 227 227 } 228 228 };
Note:
See TracChangeset
for help on using the changeset viewer.