CVS commit: src/usr.bin/passwd

[Michael van Elst]

Module Name:    src
Committed By:   mlelstv
Date:           Sat Apr 18 09:04:34 UTC 2009

Modified Files:
        src/usr.bin/passwd: krb5_passwd.c

Log Message:
avoid compiler warnings about shadowed declarations.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/passwd/krb5_passwd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.bin/passwd/krb5_passwd.c
diff -u src/usr.bin/passwd/krb5_passwd.c:1.17 src/usr.bin/passwd/krb5_passwd.c:1.18
--- src/usr.bin/passwd/krb5_passwd.c:1.17	Mon Apr 28 20:24:14 2008
+++ src/usr.bin/passwd/krb5_passwd.c	Sat Apr 18 09:04:34 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: krb5_passwd.c,v 1.17 2008/04/28 20:24:14 martin Exp $ */
+/* $NetBSD: krb5_passwd.c,v 1.18 2009/04/18 09:04:34 mlelstv Exp $ */
 
 /*
  * Copyright (c) 2000, 2005 The NetBSD Foundation, Inc.
@@ -213,18 +213,18 @@
 
 #else /* ! USE_PAM */
 
-static krb5_context context;
+static krb5_context defcontext;
 static krb5_principal defprinc;
 static int kusage = PW_USE;
 
 int
 krb5_init(const char *progname)
 {
-    return krb5_init_context(&context);
+    return krb5_init_context(&defcontext);
 }
 
 int
-krb5_arg (char ch, const char *optarg)
+krb5_arg (char ch, const char *opt)
 {
     krb5_error_code ret;
     switch(ch) {
@@ -233,9 +233,9 @@
 	kusage = PW_USE_FORCE;
 	return 1;
     case 'u':
-	ret = krb5_parse_name(context, optarg, &defprinc);
+	ret = krb5_parse_name(defcontext, opt, &defprinc);
 	if(ret) {
-	    krb5_warn(context, ret, "%s", optarg);
+	    krb5_warn(defcontext, ret, "%s", opt);
 	    return 0;
 	}
 	return 1;
@@ -252,11 +252,11 @@
 void
 krb5_end(void)
 {
-    if (context == NULL)
+    if (defcontext == NULL)
 	return;
     if(defprinc)
-	krb5_free_principal(context, defprinc);
-    krb5_free_context(context);
+	krb5_free_principal(defcontext, defprinc);
+    krb5_free_context(defcontext);
 }