projects
/
mech_eap.orig
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2578cda
)
cleanup previous commit
author
Luke Howard
<lukeh@padl.com>
Fri, 18 Mar 2011 05:18:24 +0000
(16:18 +1100)
committer
Luke Howard
<lukeh@padl.com>
Fri, 18 Mar 2011 05:18:48 +0000
(16:18 +1100)
util_name.c
patch
|
blob
|
history
diff --git
a/util_name.c
b/util_name.c
index
4add1fe
..
e52bb4e
100644
(file)
--- a/
util_name.c
+++ b/
util_name.c
@@
-157,6
+157,11
@@
gssEapGetDefaultRealm(krb5_context krbContext, char **defaultRealm)
krb5_appdefault_string(krbContext, "eap_gss",
NULL, "default_realm", "", defaultRealm);
krb5_appdefault_string(krbContext, "eap_gss",
NULL, "default_realm", "", defaultRealm);
+ if (*defaultRealm != NULL && (*defaultRealm)[0] == '\0') {
+ GSSEAP_FREE(*defaultRealm);
+ *defaultRealm = NULL;
+ }
+
return (*defaultRealm != NULL) ? 0 : KRB5_CONFIG_NODEFREALM;
}
return (*defaultRealm != NULL) ? 0 : KRB5_CONFIG_NODEFREALM;
}
@@
-256,7
+261,7
@@
importUserName(OM_uint32 *minor,
*/
gssEapGetDefaultRealm(krbContext, &defaultRealm);
*/
gssEapGetDefaultRealm(krbContext, &defaultRealm);
- if (defaultRealm == NULL
|| defaultRealm[0] == '\0'
)
+ if (defaultRealm == NULL)
flags |= KRB5_PRINCIPAL_PARSE_NO_REALM;
code = krb5_parse_name_flags(krbContext, nameString, flags, &krbPrinc);
flags |= KRB5_PRINCIPAL_PARSE_NO_REALM;
code = krb5_parse_name_flags(krbContext, nameString, flags, &krbPrinc);