diff --git a/base/applications/network/ipconfig/ipconfig.c b/base/applications/network/ipconfig/ipconfig.c index fdbdda545e1..cc9091556f5 100644 --- a/base/applications/network/ipconfig/ipconfig.c +++ b/base/applications/network/ipconfig/ipconfig.c @@ -948,7 +948,10 @@ DisplayDnsRecord( break; case DNS_TYPE_MX: - ConResPrintf(StdOut, IDS_DNSTYPEMX); + ConResPrintf(StdOut, IDS_DNSTYPEMX, + pThisRecord->Data.MX.pNameExchange, + pThisRecord->Data.MX.wPreference, + pThisRecord->Data.MX.Pad); break; case DNS_TYPE_AAAA: @@ -962,10 +965,14 @@ DisplayDnsRecord( break; case DNS_TYPE_SRV: - ConResPrintf(StdOut, IDS_DNSTYPESRV); + ConResPrintf(StdOut, IDS_DNSTYPESRV, + pThisRecord->Data.SRV.pNameTarget, + pThisRecord->Data.SRV.wPriority, + pThisRecord->Data.SRV.wWeight, + pThisRecord->Data.SRV.wPort); break; } - _tprintf(_T("\n\n")); + ConPuts(StdOut, L"\n\n"); pThisRecord = pNextRecord; } @@ -994,10 +1001,10 @@ DisplayDns(VOID) { pNextEntry = pThisEntry->pNext; - if (pThisEntry->wType1 != 0) + if (pThisEntry->wType1 != DNS_TYPE_ZERO) DisplayDnsRecord(pThisEntry->pszName, pThisEntry->wType1); - if (pThisEntry->wType2 != 0) + if (pThisEntry->wType2 != DNS_TYPE_ZERO) DisplayDnsRecord(pThisEntry->pszName, pThisEntry->wType2); if (pThisEntry->pszName) diff --git a/base/applications/network/ipconfig/lang/bg-BG.rc b/base/applications/network/ipconfig/lang/bg-BG.rc index 01235582af1..656fbe85e42 100644 --- a/base/applications/network/ipconfig/lang/bg-BG.rc +++ b/base/applications/network/ipconfig/lang/bg-BG.rc @@ -72,10 +72,10 @@ BEGIN IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" - IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : %ls\n\t %hu\n\t %hu\n" IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" - IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/de-DE.rc b/base/applications/network/ipconfig/lang/de-DE.rc index 38bf2a5306e..b63223bea39 100644 --- a/base/applications/network/ipconfig/lang/de-DE.rc +++ b/base/applications/network/ipconfig/lang/de-DE.rc @@ -74,10 +74,10 @@ BEGIN IDS_DNSTYPECNAME "\tCNAME-Eintrag . . . . : %ls\n" IDS_DNSTYPESOA "\tSOA-Eintrag . . . . . : \n" IDS_DNSTYPEPTR "\tPTR-Eintrag . . . . . : %ls\n" - IDS_DNSTYPEMX "\tMX-Eintrag. . . . . . : \n" + IDS_DNSTYPEMX "\tMX-Eintrag. . . . . . : %ls\n\t %hu\n\t %hu\n" IDS_DNSTYPEAAAA "\tAAAA-Eintrag. . . . . : %ls\n" IDS_DNSTYPEATMA "\tATMA-Eintrag. . . . . : \n" - IDS_DNSTYPESRV "\tSRV-Eintrag . . . . . : \n" + IDS_DNSTYPESRV "\tSRV-Eintrag . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/el-GR.rc b/base/applications/network/ipconfig/lang/el-GR.rc index 07465226f71..a589825849c 100644 --- a/base/applications/network/ipconfig/lang/el-GR.rc +++ b/base/applications/network/ipconfig/lang/el-GR.rc @@ -72,10 +72,10 @@ BEGIN IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" - IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : %ls\n\t %hu\n\t %hu\n" IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" - IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/en-US.rc b/base/applications/network/ipconfig/lang/en-US.rc index a7ac4081d6e..53d29782dea 100644 --- a/base/applications/network/ipconfig/lang/en-US.rc +++ b/base/applications/network/ipconfig/lang/en-US.rc @@ -72,10 +72,10 @@ BEGIN IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" - IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : %ls\n\t %hu\n\t %hu\n" IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" - IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/es-ES.rc b/base/applications/network/ipconfig/lang/es-ES.rc index 6f3e50ab052..f8557c3308c 100644 --- a/base/applications/network/ipconfig/lang/es-ES.rc +++ b/base/applications/network/ipconfig/lang/es-ES.rc @@ -73,10 +73,10 @@ BEGIN IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" - IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : %ls\n\t %hu\n\t %hu\n" IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" - IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/fr-FR.rc b/base/applications/network/ipconfig/lang/fr-FR.rc index 4f0faf0b659..fb6306c9cb3 100644 --- a/base/applications/network/ipconfig/lang/fr-FR.rc +++ b/base/applications/network/ipconfig/lang/fr-FR.rc @@ -74,10 +74,10 @@ BEGIN IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" - IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : %ls\n\t %hu\n\t %hu\n" IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" - IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/id-ID.rc b/base/applications/network/ipconfig/lang/id-ID.rc index 22e6feed929..b4c3960954b 100644 --- a/base/applications/network/ipconfig/lang/id-ID.rc +++ b/base/applications/network/ipconfig/lang/id-ID.rc @@ -72,10 +72,10 @@ BEGIN IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" - IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : %ls\n\t %hu\n\t %hu\n" IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" - IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/it-IT.rc b/base/applications/network/ipconfig/lang/it-IT.rc index e32cb06a273..335206d6369 100644 --- a/base/applications/network/ipconfig/lang/it-IT.rc +++ b/base/applications/network/ipconfig/lang/it-IT.rc @@ -72,10 +72,10 @@ BEGIN IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" - IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : %ls\n\t %hu\n\t %hu\n" IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" - IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/no-NO.rc b/base/applications/network/ipconfig/lang/no-NO.rc index 54fea726deb..260340b922b 100644 --- a/base/applications/network/ipconfig/lang/no-NO.rc +++ b/base/applications/network/ipconfig/lang/no-NO.rc @@ -72,10 +72,10 @@ BEGIN IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" - IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : %ls\n\t %hu\n\t %hu\n" IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" - IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/pl-PL.rc b/base/applications/network/ipconfig/lang/pl-PL.rc index 223d8a70835..499f1a3c846 100644 --- a/base/applications/network/ipconfig/lang/pl-PL.rc +++ b/base/applications/network/ipconfig/lang/pl-PL.rc @@ -74,10 +74,10 @@ BEGIN IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" - IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : %ls\n\t %hu\n\t %hu\n" IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" - IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/ro-RO.rc b/base/applications/network/ipconfig/lang/ro-RO.rc index 156b8204314..2ed722d8c5d 100644 --- a/base/applications/network/ipconfig/lang/ro-RO.rc +++ b/base/applications/network/ipconfig/lang/ro-RO.rc @@ -72,10 +72,10 @@ BEGIN IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" - IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : %ls\n\t %hu\n\t %hu\n" IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" - IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/ru-RU.rc b/base/applications/network/ipconfig/lang/ru-RU.rc index 51153460344..2bc1efd53d7 100644 --- a/base/applications/network/ipconfig/lang/ru-RU.rc +++ b/base/applications/network/ipconfig/lang/ru-RU.rc @@ -73,10 +73,10 @@ BEGIN IDS_DNSTYPECNAME "\tCNAME-запись . . . . : %ls\n" IDS_DNSTYPESOA "\tSOA-запись . . . . . : \n" IDS_DNSTYPEPTR "\tPTR-запись . . . . . : %ls\n" - IDS_DNSTYPEMX "\tMX-запись . . . . . . : \n" + IDS_DNSTYPEMX "\tMX-запись . . . . . . : %ls\n\t %hu\n\t %hu\n" IDS_DNSTYPEAAAA "\tAAAA-запись . . . . . : %ls\n" IDS_DNSTYPEATMA "\tATMA-запись . . . . . : \n" - IDS_DNSTYPESRV "\tSRV-запись . . . . . : \n" + IDS_DNSTYPESRV "\tSRV-запись . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/sk-SK.rc b/base/applications/network/ipconfig/lang/sk-SK.rc index fa112bef80f..c765a3e107f 100644 --- a/base/applications/network/ipconfig/lang/sk-SK.rc +++ b/base/applications/network/ipconfig/lang/sk-SK.rc @@ -72,10 +72,10 @@ BEGIN IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" - IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : %ls\n\t %hu\n\t %hu\n" IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" - IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/sq-AL.rc b/base/applications/network/ipconfig/lang/sq-AL.rc index 9c231eb18a1..801de4805e9 100644 --- a/base/applications/network/ipconfig/lang/sq-AL.rc +++ b/base/applications/network/ipconfig/lang/sq-AL.rc @@ -72,10 +72,10 @@ BEGIN IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" - IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : %ls\n\t %hu\n\t %hu\n" IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" - IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/sv-SE.rc b/base/applications/network/ipconfig/lang/sv-SE.rc index ac76e246c5e..b9bc20ba57a 100644 --- a/base/applications/network/ipconfig/lang/sv-SE.rc +++ b/base/applications/network/ipconfig/lang/sv-SE.rc @@ -73,10 +73,10 @@ BEGIN IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" - IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : %ls\n\t %hu\n\t %hu\n" IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" - IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/tr-TR.rc b/base/applications/network/ipconfig/lang/tr-TR.rc index c753f14e573..f20453269d1 100644 --- a/base/applications/network/ipconfig/lang/tr-TR.rc +++ b/base/applications/network/ipconfig/lang/tr-TR.rc @@ -73,10 +73,10 @@ BEGIN IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" - IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : %ls\n\t %hu\n\t %hu\n" IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" - IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/uk-UA.rc b/base/applications/network/ipconfig/lang/uk-UA.rc index e8376a2522e..f320a8bb3d1 100644 --- a/base/applications/network/ipconfig/lang/uk-UA.rc +++ b/base/applications/network/ipconfig/lang/uk-UA.rc @@ -73,10 +73,10 @@ BEGIN IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" - IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : %ls\n\t %hu\n\t %hu\n" IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" - IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/zh-CN.rc b/base/applications/network/ipconfig/lang/zh-CN.rc index b80af964fb4..e75397a2bdd 100644 --- a/base/applications/network/ipconfig/lang/zh-CN.rc +++ b/base/applications/network/ipconfig/lang/zh-CN.rc @@ -73,10 +73,10 @@ BEGIN IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" - IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : %ls\n\t %hu\n\t %hu\n" IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" - IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/zh-TW.rc b/base/applications/network/ipconfig/lang/zh-TW.rc index 64f7a3e9b3d..ca732d105e7 100644 --- a/base/applications/network/ipconfig/lang/zh-TW.rc +++ b/base/applications/network/ipconfig/lang/zh-TW.rc @@ -73,10 +73,10 @@ BEGIN IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" - IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : %ls\n\t %hu\n\t %hu\n" IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" - IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END STRINGTABLE