From patchwork Wed Jul 7 14:34:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 110650 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o67EYEg7014492 for ; Wed, 7 Jul 2010 14:34:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754936Ab0GGOeG (ORCPT ); Wed, 7 Jul 2010 10:34:06 -0400 Received: from cdptpa-omtalb.mail.rr.com ([75.180.132.120]:62496 "EHLO cdptpa-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755178Ab0GGOeF (ORCPT ); Wed, 7 Jul 2010 10:34:05 -0400 X-Authority-Analysis: v=1.0 c=1 a=hUDE02SEfrIA:10 a=UBIxAjGgU1YA:10 a=1Pxd53gYAAAA:8 a=hGzw-44bAAAA:8 a=wGsD4lUu6ScAcr-G8EMA:9 a=CZGt7dlT_g-FkRW0_WYBij9PBYYA:4 a=-efCBOvVPicA:10 a=dowx1zmaLagA:10 X-Cloudmark-Score: 0 X-Originating-IP: 71.70.153.3 Received: from [71.70.153.3] ([71.70.153.3:46449] helo=mail.poochiereds.net) by cdptpa-oedge01.mail.rr.com (envelope-from ) (ecelerity 2.2.2.39 r()) with ESMTP id 57/96-05585-A50943C4; Wed, 07 Jul 2010 14:34:03 +0000 Received: by mail.poochiereds.net (Postfix, from userid 4447) id 1F2365810C; Wed, 7 Jul 2010 10:34:02 -0400 (EDT) From: Jeff Layton To: linux-cifs@vger.kernel.org Cc: linux@kama-aina.net Subject: [PATCH] mount.cifs: switch to using _PATH_MNTTAB and paths.h Date: Wed, 7 Jul 2010 10:34:02 -0400 Message-Id: <1278513242-27622-1-git-send-email-jlayton@samba.org> X-Mailer: git-send-email 1.6.6.1 Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 07 Jul 2010 14:34:15 +0000 (UTC) diff --git a/mount.cifs.c b/mount.cifs.c index 51fc1a8..c84e72d 100644 --- a/mount.cifs.c +++ b/mount.cifs.c @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include #ifdef HAVE_LIBCAP_NG @@ -212,9 +212,9 @@ check_fstab(const char *progname, const char *mountpoint, const char *devname, struct mntent *mnt; /* make sure this mount is listed in /etc/fstab */ - fstab = setmntent(_PATH_FSTAB, "r"); + fstab = setmntent(_PATH_MNTTAB, "r"); if (!fstab) { - fprintf(stderr, "Couldn't open %s for reading!\n", _PATH_FSTAB); + fprintf(stderr, "Couldn't open %s for reading!\n", _PATH_MNTTAB); return EX_FILEIO; } @@ -226,7 +226,7 @@ check_fstab(const char *progname, const char *mountpoint, const char *devname, if (mnt == NULL || strcmp(mnt->mnt_fsname, devname)) { fprintf(stderr, "%s: permission denied: no match for " - "%s found in %s\n", progname, mountpoint, _PATH_FSTAB); + "%s found in %s\n", progname, mountpoint, _PATH_MNTTAB); return EX_USAGE; }