No subject

Thu Feb 24 14:23:06 CST 2011

--Juan

--001e680f087cc5ba3904a54a48a7
Content-Type: text/x-patch; charset=US-ASCII; 
	name="0017-Make-sure-machine-name-is-non-empty-before-failing.patch"
Content-Disposition: attachment; 
	filename="0017-Make-sure-machine-name-is-non-empty-before-failing.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_gopy4vtc0

RnJvbSAwMjVkNmIwNWU0NDAwNTI1NzE1NTJkNGVmOTVhMzhmNjBmYzk3MWM2IE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBKdWFuIExhbmcgPGp1YW4ubGFuZ0BnbWFpbC5jb20+CkRhdGU6
IFRodSwgOSBKdW4gMjAxMSAwOTo0OTo0MyAtMDcwMApTdWJqZWN0OiBbUEFUQ0ggMTcvMTddIE1h
a2Ugc3VyZSBtYWNoaW5lIG5hbWUgaXMgbm9uLWVtcHR5IGJlZm9yZSBmYWlsaW5nCgotLS0KIGRs
bHMvc2V0dXBhcGkvZGV2aW5zdC5jICAgICAgIHwgICAgOCArKysrKy0tLQogZGxscy9zZXR1cGFw
aS90ZXN0cy9kZXZpbnN0LmMgfCAgICA5ICsrKysrKysrKwogMiBmaWxlcyBjaGFuZ2VkLCAxNCBp
bnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RsbHMvc2V0dXBhcGkv
ZGV2aW5zdC5jIGIvZGxscy9zZXR1cGFwaS9kZXZpbnN0LmMKaW5kZXggMGEzYzNiZC4uNDJjYjlm
MCAxMDA2NDQKLS0tIGEvZGxscy9zZXR1cGFwaS9kZXZpbnN0LmMKKysrIGIvZGxscy9zZXR1cGFw
aS9kZXZpbnN0LmMKQEAgLTExMzQsNiArMTEzNCw4IEBAIFNldHVwRGlDcmVhdGVEZXZpY2VJbmZv
TGlzdEV4QShjb25zdCBHVUlEICpDbGFzc0d1aWQsCiAgICAgcmV0dXJuIGhEZXZJbmZvOwogfQog
CitzdGF0aWMgY29uc3QgV0NIQVIgZW1wdHlXW10gPSB7IDAgfTsKKwogLyoqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
CiAgKgkJU2V0dXBEaUNyZWF0ZURldmljZUluZm9MaXN0RXhXIChTRVRVUEFQSS5AKQogICoKQEAg
LTExNjMsNyArMTE2NSw3IEBAIFNldHVwRGlDcmVhdGVEZXZpY2VJbmZvTGlzdEV4Vyhjb25zdCBH
VUlEICpDbGFzc0d1aWQsCiAgICAgVFJBQ0UoIiVzICVwICVzICVwXG4iLCBkZWJ1Z3N0cl9ndWlk
KENsYXNzR3VpZCksIGh3bmRQYXJlbnQsCiAgICAgICBkZWJ1Z3N0cl93KE1hY2hpbmVOYW1lKSwg
UmVzZXJ2ZWQpOwogCi0gICAgaWYgKE1hY2hpbmVOYW1lICE9IE5VTEwpCisgICAgaWYgKE1hY2hp
bmVOYW1lICE9IE5VTEwgJiYgc3RyY21wVyhNYWNoaW5lTmFtZSwgZW1wdHlXKSkKICAgICB7CiAg
ICAgICAgIEZJWE1FKCJyZW1vdGUgc3VwcG9ydCBpcyBub3QgaW1wbGVtZW50ZWRcbiIpOwogICAg
ICAgICBTZXRMYXN0RXJyb3IoRVJST1JfSU5WQUxJRF9NQUNISU5FTkFNRSk7CkBAIC0yMzcxLDcg
KzIzNzMsNyBAQCBIREVWSU5GTyBXSU5BUEkgU2V0dXBEaUdldENsYXNzRGV2c0V4VygKICAgICAg
ICAgc2V0ID0gU2V0dXBEaUNyZWF0ZURldmljZUluZm9MaXN0RXhXKGNsYXNzLCBwYXJlbnQsIG1h
Y2hpbmUsIHJlc2VydmVkKTsKICAgICBpZiAoc2V0KQogICAgIHsKLSAgICAgICAgaWYgKG1hY2hp
bmUpCisgICAgICAgIGlmIChtYWNoaW5lICYmIHN0cmNtcFcobWFjaGluZSwgZW1wdHlXKSkKICAg
ICAgICAgICAgIEZJWE1FKCIlczogdW5pbXBsZW1lbnRlZCBmb3IgcmVtb3RlIG1hY2hpbmVzXG4i
LAogICAgICAgICAgICAgICAgICAgICBkZWJ1Z3N0cl93KG1hY2hpbmUpKTsKICAgICAgICAgZWxz
ZSBpZiAoZmxhZ3MgJiBESUdDRl9ERVZJQ0VJTlRFUkZBQ0UpCkBAIC0zNTYyLDcgKzM1NjQsNyBA
QCBIS0VZIFdJTkFQSSBTZXR1cERpT3BlbkNsYXNzUmVnS2V5RXhXKAogICAgIExQQ1dTVFIgbHBL
ZXlOYW1lOwogICAgIExPTkcgbDsKIAotICAgIGlmIChNYWNoaW5lTmFtZSAhPSBOVUxMKQorICAg
IGlmIChNYWNoaW5lTmFtZSAhPSBOVUxMICYmIHN0cmNtcFcoTWFjaGluZU5hbWUsIGVtcHR5Vykp
CiAgICAgewogICAgICAgICBGSVhNRSgiUmVtb3RlIGFjY2VzcyBub3Qgc3VwcG9ydGVkIHlldCFc
biIpOwogICAgICAgICByZXR1cm4gSU5WQUxJRF9IQU5ETEVfVkFMVUU7CmRpZmYgLS1naXQgYS9k
bGxzL3NldHVwYXBpL3Rlc3RzL2Rldmluc3QuYyBiL2RsbHMvc2V0dXBhcGkvdGVzdHMvZGV2aW5z
dC5jCmluZGV4IDE5MDU0MDYuLjNjMDFmMzIgMTAwNjQ0Ci0tLSBhL2RsbHMvc2V0dXBhcGkvdGVz
dHMvZGV2aW5zdC5jCisrKyBiL2RsbHMvc2V0dXBhcGkvdGVzdHMvZGV2aW5zdC5jCkBAIC0yNjEs
NiArMjYxLDcgQEAgc3RhdGljIHZvaWQgdGVzdF9TZXR1cERpQ3JlYXRlRGV2aWNlSW5mb0xpc3RF
eCh2b2lkKQogICAgIERXT1JEIGVycm9yOwogICAgIHN0YXRpYyBDSEFSIG5vdG51bGxbXSA9ICJO
b3ROdWxsIjsKICAgICBzdGF0aWMgY29uc3QgV0NIQVIgbWFjaGluZVtdID0geyAnZCcsJ3UnLCdt
JywnbScsJ3knLDAgfTsKKyAgICBzdGF0aWMgY29uc3QgV0NIQVIgZW1wdHlbXSA9IHsgMCB9Owog
CiAgICAgU2V0TGFzdEVycm9yKDB4ZGVhZGJlZWYpOwogICAgIC8qIGNyZWF0ZSBlbXB0eSBEZXZp
Y2VJbmZvTGlzdCwgYnV0IHNldCBSZXNlcnZlZCB0byBhIHZhbHVlLCB3aGljaCBpcyBub3QgTlVM
TCAqLwpAQCAtMjkwLDYgKzI5MSwxNCBAQCBzdGF0aWMgdm9pZCB0ZXN0X1NldHVwRGlDcmVhdGVE
ZXZpY2VJbmZvTGlzdEV4KHZvaWQpCiAgICAgLyogZGVzdHJveSBEZXZpY2VJbmZvTGlzdCAqLwog
ICAgIHJldCA9IHBTZXR1cERpRGVzdHJveURldmljZUluZm9MaXN0KGRldmxpc3QpOwogICAgIG9r
KHJldCwgIlNldHVwRGlEZXN0cm95RGV2aWNlSW5mb0xpc3QgZmFpbGVkIDogJWRcbiIsIGVycm9y
KTsKKworICAgIC8qIGNyZWF0ZSBlbXB0eSBEZXZpY2VJbmZvTGlzdCB3aXRoIGVtcHR5IG1hY2hp
bmUgbmFtZSAqLworICAgIGRldmxpc3QgPSBwU2V0dXBEaUNyZWF0ZURldmljZUluZm9MaXN0RXhX
KE5VTEwsIE5VTEwsIGVtcHR5LCBOVUxMKTsKKyAgICBvayhkZXZsaXN0ICYmIGRldmxpc3QgIT0g
SU5WQUxJRF9IQU5ETEVfVkFMVUUsICJTZXR1cERpQ3JlYXRlRGV2aWNlSW5mb0xpc3RFeFcgZmFp
bGVkIDogJXAgJWQgKGV4cGVjdGVkICE9ICVwKVxuIiwgZGV2bGlzdCwgZXJyb3IsIElOVkFMSURf
SEFORExFX1ZBTFVFKTsKKworICAgIC8qIGRlc3Ryb3kgRGV2aWNlSW5mb0xpc3QgKi8KKyAgICBy
ZXQgPSBwU2V0dXBEaURlc3Ryb3lEZXZpY2VJbmZvTGlzdChkZXZsaXN0KTsKKyAgICBvayhyZXQs
ICJTZXR1cERpRGVzdHJveURldmljZUluZm9MaXN0IGZhaWxlZCA6ICVkXG4iLCBlcnJvcik7CiB9
CiAKIHN0YXRpYyB2b2lkIHRlc3RfU2V0dXBEaU9wZW5DbGFzc1JlZ0tleUV4QSh2b2lkKQotLSAK
MS43LjEKCg==
--001e680f087cc5ba3904a54a48a7--