From patchwork Wed Jul 8 18:26:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 493081 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from userp1040.oracle.com (userp1040.oracle.com [156.151.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 911A51402B7 for ; Thu, 9 Jul 2015 04:26:52 +1000 (AEST) Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t68IQlHB004824 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 8 Jul 2015 18:26:48 GMT Received: from oss.oracle.com (oss-old-reserved.oracle.com [137.254.22.2]) by aserv0022.oracle.com (8.13.8/8.13.8) with ESMTP id t68IQlCc031703 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 8 Jul 2015 18:26:47 GMT Received: from localhost ([127.0.0.1] helo=lb-oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1ZCu3T-00065w-Jw; Wed, 08 Jul 2015 11:26:47 -0700 Received: from userv0021.oracle.com ([156.151.31.71]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1ZCu2z-00064R-4c for fedfs-utils-devel@oss.oracle.com; Wed, 08 Jul 2015 11:26:17 -0700 Received: from aserp1020.oracle.com (aserp1020.oracle.com [141.146.126.67]) by userv0021.oracle.com (8.13.8/8.13.8) with ESMTP id t68IQGx2004950 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 8 Jul 2015 18:26:16 GMT Received: from userp2030.oracle.com (userp2030.oracle.com [156.151.31.89]) by aserp1020.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t68IQF3M013489 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Wed, 8 Jul 2015 18:26:16 GMT Authentication-Results: aserp1020.oracle.com; dkim=pass reason="2048-bit key" header.d=gmail.com header.i=@gmail.com header.b=fzBvkaTg Received: from pps.filterd (userp2030.oracle.com [127.0.0.1]) by userp2030.oracle.com (8.14.7/8.14.7) with SMTP id t68IOOlT045541 for ; Wed, 8 Jul 2015 18:26:15 GMT Received: from mail-qk0-f171.google.com (mail-qk0-f171.google.com [209.85.220.171]) by userp2030.oracle.com with ESMTP id 1vh4bmr476-1 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 08 Jul 2015 18:26:15 +0000 Received: by qkbp125 with SMTP id p125so169283499qkb.2 for ; Wed, 08 Jul 2015 11:26:14 -0700 (PDT) X-Received: by 10.140.217.84 with SMTP id n81mr19240308qhb.100.1436379974492; Wed, 08 Jul 2015 11:26:14 -0700 (PDT) Received: from seurat.1015granger.net ([2604:8800:100:81fc:20c:29ff:fe44:ec31]) by smtp.gmail.com with ESMTPSA id t9sm1898511qgd.37.2015.07.08.11.26.13 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jul 2015 11:26:13 -0700 (PDT) From: Chuck Lever To: fedfs-utils-devel@oss.oracle.com Date: Wed, 08 Jul 2015 11:26:12 -0700 Message-ID: <20150708182612.24274.66419.stgit@seurat.1015granger.net> In-Reply-To: <20150708182053.24274.13851.stgit@seurat.1015granger.net> References: <20150708182053.24274.13851.stgit@seurat.1015granger.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-ServerName: mail-qk0-f171.google.com X-Proofpoint-Virus-Version: vendor=nai engine=5700 definitions=7856 signatures=670602 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 kscore.is_bulkscore=0 kscore.compositescore=1 compositescore=0.9 suspectscore=1 phishscore=0 bulkscore=0 kscore.is_spamscore=0 rbsscore=0.9 spamscore=0 urlsuspectscore=0.9 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=7.0.1-1506180000 definitions=main-1507080276 Subject: [fedfs-utils] [PATCH 02/11] fedfsc: Replace use of admin_hostname() in error message X-BeenThere: fedfs-utils-devel@oss.oracle.com X-Mailman-Version: 2.1.9 Precedence: list Reply-To: fedfs-utils Developers List-Id: fedfs-utils Developers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: fedfs-utils-devel-bounces@oss.oracle.com Errors-To: fedfs-utils-devel-bounces@oss.oracle.com X-Source-IP: aserv0022.oracle.com [141.146.126.234] Avoid a segfault when admin_create() call fails. Displaying the error message tries to dereference "host" but it was never initialized. Fixes: f088d2e7956e ('fedfsc: Convert fedfs-create-junction ...') Signed-off-by: Chuck Lever --- src/fedfsc/fedfs-create-junction.c | 2 +- src/fedfsc/fedfs-create-replication.c | 2 +- src/fedfsc/fedfs-delete-junction.c | 2 +- src/fedfsc/fedfs-delete-replication.c | 2 +- src/fedfsc/fedfs-get-limited-nsdb-params.c | 2 +- src/fedfsc/fedfs-get-nsdb-params.c | 2 +- src/fedfsc/fedfs-lookup-junction.c | 2 +- src/fedfsc/fedfs-lookup-replication.c | 2 +- src/fedfsc/fedfs-null.c | 2 +- src/fedfsc/fedfs-set-nsdb-params.c | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/fedfsc/fedfs-create-junction.c b/src/fedfsc/fedfs-create-junction.c index 987c02a..bbd1598 100644 --- a/src/fedfsc/fedfs-create-junction.c +++ b/src/fedfsc/fedfs-create-junction.c @@ -173,7 +173,7 @@ fedfs_create_junction_host(const char *hostname, const char *nettype, break; default: xlog(L_ERROR, "%s", - admin_open_perror(admin_hostname(host))); + admin_open_perror(hostname)); } return status; diff --git a/src/fedfsc/fedfs-create-replication.c b/src/fedfsc/fedfs-create-replication.c index 4effb2c..a9b2ec1 100644 --- a/src/fedfsc/fedfs-create-replication.c +++ b/src/fedfsc/fedfs-create-replication.c @@ -173,7 +173,7 @@ fedfs_create_replication_host(const char *hostname, const char *nettype, break; default: xlog(L_ERROR, "%s", - admin_open_perror(admin_hostname(host))); + admin_open_perror(hostname)); } return status; diff --git a/src/fedfsc/fedfs-delete-junction.c b/src/fedfsc/fedfs-delete-junction.c index 97bd072..6e0211d 100644 --- a/src/fedfsc/fedfs-delete-junction.c +++ b/src/fedfsc/fedfs-delete-junction.c @@ -163,7 +163,7 @@ fedfs_delete_junction_host(const char *hostname, const char *nettype, break; default: xlog(L_ERROR, "%s", - admin_open_perror(admin_hostname(host))); + admin_open_perror(hostname)); } return status; diff --git a/src/fedfsc/fedfs-delete-replication.c b/src/fedfsc/fedfs-delete-replication.c index aff44f6..a1aca41 100644 --- a/src/fedfsc/fedfs-delete-replication.c +++ b/src/fedfsc/fedfs-delete-replication.c @@ -163,7 +163,7 @@ fedfs_delete_replication_host(const char *hostname, const char *nettype, break; default: xlog(L_ERROR, "%s", - admin_open_perror(admin_hostname(host))); + admin_open_perror(hostname)); } return status; diff --git a/src/fedfsc/fedfs-get-limited-nsdb-params.c b/src/fedfsc/fedfs-get-limited-nsdb-params.c index ec66d86..7e98fb2 100644 --- a/src/fedfsc/fedfs-get-limited-nsdb-params.c +++ b/src/fedfsc/fedfs-get-limited-nsdb-params.c @@ -190,7 +190,7 @@ fedfs_get_limited_nsdb_params_host(const char *hostname, const char *nettype, break; default: xlog(L_ERROR, "%s", - admin_open_perror(admin_hostname(host))); + admin_open_perror(hostname)); } return status; diff --git a/src/fedfsc/fedfs-get-nsdb-params.c b/src/fedfsc/fedfs-get-nsdb-params.c index 4bef1aa..3bd1e98 100644 --- a/src/fedfsc/fedfs-get-nsdb-params.c +++ b/src/fedfsc/fedfs-get-nsdb-params.c @@ -206,7 +206,7 @@ fedfs_get_nsdb_params_host(const char *hostname, const char *nettype, break; default: xlog(L_ERROR, "%s", - admin_open_perror(admin_hostname(host))); + admin_open_perror(hostname)); } return status; diff --git a/src/fedfsc/fedfs-lookup-junction.c b/src/fedfsc/fedfs-lookup-junction.c index b43a6ae..d9fb519 100644 --- a/src/fedfsc/fedfs-lookup-junction.c +++ b/src/fedfsc/fedfs-lookup-junction.c @@ -242,7 +242,7 @@ fedfs_lookup_junction_host(const char *hostname, const char *nettype, break; default: xlog(L_ERROR, "%s", - admin_open_perror(admin_hostname(host))); + admin_open_perror(hostname)); } return status; diff --git a/src/fedfsc/fedfs-lookup-replication.c b/src/fedfsc/fedfs-lookup-replication.c index e258f8b..c6f0b2c 100644 --- a/src/fedfsc/fedfs-lookup-replication.c +++ b/src/fedfsc/fedfs-lookup-replication.c @@ -243,7 +243,7 @@ fedfs_lookup_replication_host(const char *hostname, const char *nettype, break; default: xlog(L_ERROR, "%s", - admin_open_perror(admin_hostname(host))); + admin_open_perror(hostname)); } return status; diff --git a/src/fedfsc/fedfs-null.c b/src/fedfsc/fedfs-null.c index 8e63b7d..2476eaf 100644 --- a/src/fedfsc/fedfs-null.c +++ b/src/fedfsc/fedfs-null.c @@ -156,7 +156,7 @@ fedfs_null_host(const char *hostname, const char *nettype, break; default: xlog(L_ERROR, "%s", - admin_open_perror(admin_hostname(host))); + admin_open_perror(hostname)); } return status; diff --git a/src/fedfsc/fedfs-set-nsdb-params.c b/src/fedfsc/fedfs-set-nsdb-params.c index 2ac3568..70473fd 100644 --- a/src/fedfsc/fedfs-set-nsdb-params.c +++ b/src/fedfsc/fedfs-set-nsdb-params.c @@ -176,7 +176,7 @@ fedfs_set_nsdb_params_host(const char *hostname, const char *nettype, break; default: xlog(L_ERROR, "%s", - admin_open_perror(admin_hostname(host))); + admin_open_perror(hostname)); } return status;