diff options
author | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2013-10-15 12:10:38 +0200 |
---|---|---|
committer | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2013-10-17 13:43:59 +0200 |
commit | b475703544afedf0aaeae7f28b8816bd23c10cd9 (patch) | |
tree | 125aacbe461bcc8e820010d58f7a1dbdf79c3dba /src/providers/krb5/krb5_common.c | |
parent | 29dedbdbb80ee672802a2f027ec41c382e8d260b (diff) | |
download | sssd-b475703544afedf0aaeae7f28b8816bd23c10cd9.tar.gz sssd-b475703544afedf0aaeae7f28b8816bd23c10cd9.tar.bz2 sssd-b475703544afedf0aaeae7f28b8816bd23c10cd9.zip |
heimdal: Rename krb5_realm since thats a type in heimdal
Fixes -Wshadow warning.
find -name '*.c' -exec sed -i \
-e 's/\([^"_]\)krb5_realm\([^"_]\)/\1krb5_realm_str\2/' \
-e 's/\(Missing krb5_realm\)_str/\1/' \
-e 's/\(No explicit krb5_realm\)_str/\1'
{} +
Diffstat (limited to 'src/providers/krb5/krb5_common.c')
-rw-r--r-- | src/providers/krb5/krb5_common.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/providers/krb5/krb5_common.c b/src/providers/krb5/krb5_common.c index 63d81d6d..4ab359e8 100644 --- a/src/providers/krb5/krb5_common.c +++ b/src/providers/krb5/krb5_common.c @@ -895,7 +895,7 @@ errno_t krb5_install_offline_callback(struct be_ctx *be_ctx, { int ret; struct remove_info_files_ctx *ctx; - const char *krb5_realm; + const char *krb5_realm_str; if (krb5_ctx->service == NULL || krb5_ctx->service->name == NULL) { DEBUG(1, ("Missing KDC service name!\n")); @@ -908,14 +908,14 @@ errno_t krb5_install_offline_callback(struct be_ctx *be_ctx, return ENOMEM; } - krb5_realm = dp_opt_get_cstring(krb5_ctx->opts, KRB5_REALM); - if (krb5_realm == NULL) { + krb5_realm_str = dp_opt_get_cstring(krb5_ctx->opts, KRB5_REALM); + if (krb5_realm_str == NULL) { DEBUG(1, ("Missing krb5_realm option!\n")); ret = EINVAL; goto done; } - ctx->realm = talloc_strdup(ctx, krb5_realm); + ctx->realm = talloc_strdup(ctx, krb5_realm_str); if (ctx->realm == NULL) { DEBUG(1, ("talloc_strdup failed!\n")); ret = ENOMEM; @@ -950,19 +950,19 @@ done: errno_t krb5_install_sigterm_handler(struct tevent_context *ev, struct krb5_ctx *krb5_ctx) { - const char *krb5_realm; + const char *krb5_realm_str; char *sig_realm; struct tevent_signal *sige; BlockSignals(false, SIGTERM); - krb5_realm = dp_opt_get_cstring(krb5_ctx->opts, KRB5_REALM); - if (krb5_realm == NULL) { + krb5_realm_str = dp_opt_get_cstring(krb5_ctx->opts, KRB5_REALM); + if (krb5_realm_str == NULL) { DEBUG(1, ("Missing krb5_realm option!\n")); return EINVAL; } - sig_realm = talloc_strdup(krb5_ctx, krb5_realm); + sig_realm = talloc_strdup(krb5_ctx, krb5_realm_str); if (sig_realm == NULL) { DEBUG(1, ("talloc_strdup failed!\n")); return ENOMEM; |