aklog-20040729

Fix afs_realm_of_cell5() to validate the return value of
krb5_get_host_realm

diff --git a/src/WINNT/aklog/aklog.c b/src/WINNT/aklog/aklog.c
index f3a6fb435355624625050b931cf0f308cf081fef..35f60d3175283a97335c856dfa16922475e07ffe 100644 (file)
--- a/src/WINNT/aklog/aklog.c
+++ b/src/WINNT/aklog/aklog.c
@@ -355,7 +355,7 @@ static char *afs_realm_of_cell(struct afsconf_cell *cellconfig)
 
 static char *afs_realm_of_cell5(krb5_context context, struct afsconf_cell *cellconfig)
 {
-       char ** krbrlms;
+       char ** krbrlms = 0;
        static char krbrlm[REALM_SZ+1];
        krb5_error_code status;
 
@@ -364,14 +364,14 @@ static char *afs_realm_of_cell5(krb5_context context, struct afsconf_cell *cellc
 
        status = krb5_get_host_realm( context, cellconfig->hostName[0], &krbrlms );
 
-       if(krbrlms && krbrlms[0])
+       if (status == 0 && krbrlms && krbrlms[0]) {
                strcpy(krbrlm, krbrlms[0]);
-       else {
+    } else {
                strcpy(krbrlm, cellconfig->name);
                strupr(krbrlm);
        }
 
-       if(krbrlms)
+       if (krbrlms)
                krb5_free_host_realm( context, krbrlms );
 
        return krbrlm;