From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qg0-f43.google.com ([209.85.192.43]:34430 "EHLO mail-qg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752438AbbHEOqX (ORCPT ); Wed, 5 Aug 2015 10:46:23 -0400 Received: by qgeu79 with SMTP id u79so31367151qge.1 for ; Wed, 05 Aug 2015 07:46:22 -0700 (PDT) Subject: [PATCH v2 6/6] nfsidmap: Clean up other exit status cases From: Chuck Lever To: steved@redhat.com Cc: linux-nfs@vger.kernel.org Date: Wed, 05 Aug 2015 10:46:21 -0400 Message-ID: <20150805144621.13266.52898.stgit@manet.1015granger.net> In-Reply-To: <20150805143258.13266.92369.stgit@manet.1015granger.net> References: <20150805143258.13266.92369.stgit@manet.1015granger.net> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Sender: linux-nfs-owner@vger.kernel.org List-ID: Make it unambiguous where 0 or 1 represent an exit status. Signed-off-by: Chuck Lever --- utils/nfsidmap/nfsidmap.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/utils/nfsidmap/nfsidmap.c b/utils/nfsidmap/nfsidmap.c index dbfac9b..52e634f 100644 --- a/utils/nfsidmap/nfsidmap.c +++ b/utils/nfsidmap/nfsidmap.c @@ -286,7 +286,7 @@ static int key_invalidate(char *keystr, int keymask) if ((fp = fopen(PROCKEYS, "r")) == NULL) { xlog_err("fopen(%s) failed: %m", PROCKEYS); - return 1; + return EXIT_FAILURE; } while(fgets(buf, BUFSIZ, fp) != NULL) { @@ -325,13 +325,13 @@ static int key_invalidate(char *keystr, int keymask) if (errno != EOPNOTSUPP) { xlog_err("keyctl_invalidate(0x%x) failed: %m", key); fclose(fp); - return 1; + return EXIT_FAILURE; } else { /* older kernel compatibility attempt: */ if (keyctl_revoke(key) < 0) { xlog_err("keyctl_revoke(0x%x) failed: %m", key); fclose(fp); - return 1; + return EXIT_FAILURE; } } } @@ -339,12 +339,12 @@ static int key_invalidate(char *keystr, int keymask) keymask &= ~mask; if (keymask == 0) { fclose(fp); - return 0; + return EXIT_SUCCESS; } } xlog_err("'%s' key was not found.", keystr); fclose(fp); - return 1; + return EXIT_FAILURE; } int main(int argc, char **argv) @@ -403,7 +403,7 @@ int main(int argc, char **argv) if ((rc = nfs4_init_name_mapping(PATH_IDMAPDCONF))) { xlog_errno(rc, "Unable to create name to user id mappings."); - return 1; + return EXIT_FAILURE; } if (!verbose) verbose = conf_get_num("General", "Verbosity", 0); @@ -413,20 +413,18 @@ int main(int argc, char **argv) if (list) return list_keyring(DEFAULT_KEYRING); if (keystr) { - rc = key_invalidate(keystr, keymask); - return rc; + return key_invalidate(keystr, keymask); } if (clearing) { xlog_syslog(0); - rc = keyring_clear(DEFAULT_KEYRING); - return rc; + return keyring_clear(DEFAULT_KEYRING); } xlog_stderr(0); if ((argc - optind) != 2) { xlog_err("Bad arg count. Check /etc/request-key.conf"); xlog_warn(usage, progname); - return 1; + return EXIT_FAILURE; } if (verbose) @@ -437,13 +435,14 @@ int main(int argc, char **argv) arg = strdup(argv[optind]); if (arg == NULL) { xlog_err("strdup failed: %m"); - return 1; + return EXIT_FAILURE; } type = strtok(arg, ":"); value = strtok(NULL, ":"); - if (value == NULL) { + if (value == NULL) { + free(arg); xlog_err("Error: Null uid/gid value."); - return 1; + return EXIT_FAILURE; } if (verbose) { xlog_warn("key: 0x%lx type: %s value: %s timeout %ld", @@ -463,7 +462,7 @@ int main(int argc, char **argv) rc = name_lookup(value, key, GROUP); /* Set timeout to 10 (600 seconds) minutes */ - if (rc == 0) + if (rc == EXIT_SUCCESS) keyctl_set_timeout(key, timeout); free(arg);