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:17:26 +0200 |
| commit | 89e890c034474fcd6e5bf7148ab0c44a6b2477d5 (patch) | |
| tree | 5a12421baa9277adc7a40cd1014d5a7fb02fa709 /src/providers/krb5/krb5_init.c | |
| parent | fe4e8444d47e4268c11a681b6cd4dd8b0840a168 (diff) | |
| download | sssd-89e890c034474fcd6e5bf7148ab0c44a6b2477d5.tar.gz sssd-89e890c034474fcd6e5bf7148ab0c44a6b2477d5.tar.bz2 sssd-89e890c034474fcd6e5bf7148ab0c44a6b2477d5.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_init.c')
| -rw-r--r-- | src/providers/krb5/krb5_init.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/providers/krb5/krb5_init.c b/src/providers/krb5/krb5_init.c index 91f701a1..fb7304b6 100644 --- a/src/providers/krb5/krb5_init.c +++ b/src/providers/krb5/krb5_init.c @@ -64,7 +64,7 @@ int sssm_krb5_auth_init(struct be_ctx *bectx, const char *krb5_backup_servers; const char *krb5_kpasswd_servers; const char *krb5_backup_kpasswd_servers; - const char *krb5_realm; + const char *krb5_realm_str; const char *errstr; int errval; int errpos; @@ -103,15 +103,15 @@ int sssm_krb5_auth_init(struct be_ctx *bectx, krb5_servers = dp_opt_get_string(ctx->opts, KRB5_KDC); krb5_backup_servers = dp_opt_get_string(ctx->opts, KRB5_BACKUP_KDC); - krb5_realm = dp_opt_get_string(ctx->opts, KRB5_REALM); - if (krb5_realm == NULL) { + krb5_realm_str = dp_opt_get_string(ctx->opts, KRB5_REALM); + if (krb5_realm_str == NULL) { DEBUG(0, ("Missing krb5_realm option!\n")); return EINVAL; } ret = krb5_service_init(ctx, bectx, SSS_KRB5KDC_FO_SRV, krb5_servers, - krb5_backup_servers, krb5_realm, + krb5_backup_servers, krb5_realm_str, dp_opt_get_bool(krb5_options->opts, KRB5_USE_KDCINFO), &ctx->service); @@ -137,7 +137,7 @@ int sssm_krb5_auth_init(struct be_ctx *bectx, } else { ret = krb5_service_init(ctx, bectx, SSS_KRB5KPASSWD_FO_SRV, krb5_kpasswd_servers, - krb5_backup_kpasswd_servers, krb5_realm, + krb5_backup_kpasswd_servers, krb5_realm_str, dp_opt_get_bool(krb5_options->opts, KRB5_USE_KDCINFO), &ctx->kpasswd_service); |