diff options
Diffstat (limited to 'src/providers/ldap/ldap_common.c')
| -rw-r--r-- | src/providers/ldap/ldap_common.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/providers/ldap/ldap_common.c b/src/providers/ldap/ldap_common.c index b3a048c1..a50a072d 100644 --- a/src/providers/ldap/ldap_common.c +++ b/src/providers/ldap/ldap_common.c @@ -1261,7 +1261,7 @@ done: static const char * sdap_gssapi_get_default_realm(TALLOC_CTX *mem_ctx) { - char *krb5_realm = NULL; + char *krb5_realm_str = NULL; const char *realm = NULL; krb5_error_code krberr; krb5_context context = NULL; @@ -1272,15 +1272,15 @@ sdap_gssapi_get_default_realm(TALLOC_CTX *mem_ctx) goto done; } - krberr = krb5_get_default_realm(context, &krb5_realm); + krberr = krb5_get_default_realm(context, &krb5_realm_str); if (krberr) { DEBUG(2, ("Failed to get default realm name: %s\n", sss_krb5_get_error_message(context, krberr))); goto done; } - realm = talloc_strdup(mem_ctx, krb5_realm); - krb5_free_default_realm(context, krb5_realm); + realm = talloc_strdup(mem_ctx, krb5_realm_str); + krb5_free_default_realm(context, krb5_realm_str); if (!realm) { DEBUG(0, ("Out of memory\n")); goto done; @@ -1301,7 +1301,7 @@ int sdap_gssapi_init(TALLOC_CTX *mem_ctx, int ret; const char *krb5_servers; const char *krb5_backup_servers; - const char *krb5_realm; + const char *krb5_realm_str; const char *krb5_opt_realm; struct krb5_service *service = NULL; TALLOC_CTX *tmp_ctx; @@ -1315,15 +1315,15 @@ int sdap_gssapi_init(TALLOC_CTX *mem_ctx, krb5_opt_realm = dp_opt_get_string(opts, SDAP_KRB5_REALM); if (krb5_opt_realm == NULL) { DEBUG(2, ("Missing krb5_realm option, will use libkrb default\n")); - krb5_realm = sdap_gssapi_get_default_realm(tmp_ctx); - if (krb5_realm == NULL) { + krb5_realm_str = sdap_gssapi_get_default_realm(tmp_ctx); + if (krb5_realm_str == NULL) { DEBUG(0, ("Cannot determine the Kerberos realm, aborting\n")); ret = EIO; goto done; } } else { - krb5_realm = talloc_strdup(tmp_ctx, krb5_opt_realm); - if (krb5_realm == NULL) { + krb5_realm_str = talloc_strdup(tmp_ctx, krb5_opt_realm); + if (krb5_realm_str == NULL) { ret = ENOMEM; goto done; } @@ -1331,7 +1331,7 @@ int sdap_gssapi_init(TALLOC_CTX *mem_ctx, ret = krb5_service_init(mem_ctx, bectx, SSS_KRB5KDC_FO_SRV, krb5_servers, - krb5_backup_servers, krb5_realm, + krb5_backup_servers, krb5_realm_str, dp_opt_get_bool(opts, SDAP_KRB5_USE_KDCINFO), &service); @@ -1340,14 +1340,14 @@ int sdap_gssapi_init(TALLOC_CTX *mem_ctx, goto done; } - ret = sdap_install_sigterm_handler(mem_ctx, bectx->ev, krb5_realm); + ret = sdap_install_sigterm_handler(mem_ctx, bectx->ev, krb5_realm_str); if (ret != EOK) { DEBUG(0, ("Failed to install sigterm handler\n")); goto done; } ret = sdap_install_offline_callback(mem_ctx, bectx, - krb5_realm, SSS_KRB5KDC_FO_SRV); + krb5_realm_str, SSS_KRB5KDC_FO_SRV); if (ret != EOK) { DEBUG(0, ("Failed to install sigterm handler\n")); goto done; |