From: Greg Hudson <ghudson@mit.edu>
Date: Sun, 4 Oct 2015 23:54:35 +0000 (-0400)
Subject: Make ksu work when unsetenv() returns NULL
X-Git-Tag: krb5-1.15-beta1~343
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7eee546db10e907666e02fdded4f512e8d0faf4c;p=thirdparty%2Fkrb5.git

Make ksu work when unsetenv() returns NULL

Some older platforms (OS X 10.4, glibc 2.2.1) declare unsetenv() as
returning void, as does ksu's compatibility definition of unsetenv().
Don't use the return value in get_configured_defccname().

ticket: 8267
target_version: 1.14
tags: pullup
---

diff --git a/src/clients/ksu/main.c b/src/clients/ksu/main.c
index 453dae65a2..2f8d8e1122 100644
--- a/src/clients/ksu/main.c
+++ b/src/clients/ksu/main.c
@@ -810,12 +810,7 @@ get_configured_defccname(krb5_context context, char **target_out)
 
     *target_out = NULL;
 
-    if (unsetenv(KRB5_ENV_CCNAME) != 0) {
-        retval = errno;
-        com_err(prog_name, retval, _("while clearing the value of %s"),
-                KRB5_ENV_CCNAME);
-        return retval;
-    }
+    unsetenv(KRB5_ENV_CCNAME);
 
     /* Make sure we don't have a cached value for a different uid. */
     retval = krb5_cc_set_default_name(context, NULL);