From b475703544afedf0aaeae7f28b8816bd23c10cd9 Mon Sep 17 00:00:00 2001
From: Benjamin Franzke <benjaminfranzke@googlemail.com>
Date: Tue, 15 Oct 2013 12:10:38 +0200
Subject: 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'
    {} +
---
 src/providers/krb5/krb5_common.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/providers/krb5/krb5_common.c')

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;
-- 
cgit