diff options
| author | Zhanna Tsitkov <tsitkova@mit.edu> | 2009-02-19 20:15:04 +0000 |
|---|---|---|
| committer | Zhanna Tsitkov <tsitkova@mit.edu> | 2009-02-19 20:15:04 +0000 |
| commit | 639c9d0f5a7c68dc98a2a452abc05ca32443cddf (patch) | |
| tree | d256ea3e96501ae22f5d905921b4ef4ba3af4ddc /src | |
| parent | a08353096de4ae17bc7a242d97f6665353b81061 (diff) | |
| download | krb5-639c9d0f5a7c68dc98a2a452abc05ca32443cddf.tar.gz krb5-639c9d0f5a7c68dc98a2a452abc05ca32443cddf.tar.xz krb5-639c9d0f5a7c68dc98a2a452abc05ca32443cddf.zip | |
Fix in handle_referral_params
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22037 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/kdc/main.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/kdc/main.c b/src/kdc/main.c index 4fc1c7834..cc2ba8667 100644 --- a/src/kdc/main.c +++ b/src/kdc/main.c @@ -175,7 +175,6 @@ handle_referral_params(krb5_realm_params *rparams, kdc_realm_t *rdp ) { krb5_error_code retval = 0; - if (no_refrls && krb5_match_config_pattern(no_refrls, KRB5_CONF_ASTERISK) == TRUE) { rdp->realm_no_host_referral = strdup(KRB5_CONF_ASTERISK); if (!rdp->realm_no_host_referral) @@ -192,9 +191,10 @@ handle_referral_params(krb5_realm_params *rparams, else if (asprintf(&(rdp->realm_no_host_referral),"%s%s%s", " ", rparams->realm_no_host_referral, " ") < 0) retval = ENOMEM; - } else if( no_refrls != NULL && asprintf(&(rdp->realm_no_host_referral),"%s%s%s", " ", no_refrls, " ") < 0) - retval = ENOMEM; - else + } else if( no_refrls != NULL) { + if ( asprintf(&(rdp->realm_no_host_referral),"%s%s%s", " ", no_refrls, " ") < 0) + retval = ENOMEM; + } else rdp->realm_no_host_referral = NULL; } @@ -213,16 +213,17 @@ handle_referral_params(krb5_realm_params *rparams, rdp->realm_host_based_services = strdup(KRB5_CONF_ASTERISK); if (!rdp->realm_host_based_services) retval = ENOMEM; - } else if (host_based_srvcs && asprintf(&(rdp->realm_host_based_services), "%s%s%s%s%s", + } else if (host_based_srvcs) { + if (asprintf(&(rdp->realm_host_based_services), "%s%s%s%s%s", " ", host_based_srvcs," ",rparams->realm_host_based_services, " ") < 0) retval = ENOMEM; - else if (asprintf(&(rdp->realm_host_based_services),"%s%s%s", " ", + } else if (asprintf(&(rdp->realm_host_based_services),"%s%s%s", " ", rparams->realm_host_based_services, " ") < 0) retval = ENOMEM; - } else if(host_based_srvcs != NULL && asprintf(&(rdp->realm_host_based_services),"%s%s%s", - " ", host_based_srvcs, " ") < 0) + } else if (host_based_srvcs) { + if (asprintf(&(rdp->realm_host_based_services),"%s%s%s", " ", host_based_srvcs, " ") < 0) retval = ENOMEM; - else + } else rdp->realm_host_based_services = NULL; } |