On Wed, Aug 12, 2009 at 06:52:40PM +0200, Jim Meyering wrote:
From: Jim Meyering <meyering@redhat.com>
--- daemon/daemon.h | 2 +- daemon/sfdisk.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/daemon/daemon.h b/daemon/daemon.h index 166f3bf..bebc86f 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -174,7 +174,7 @@ extern void reply (xdrproc_t xdrp, char *ret); #define NEED_ROOT_OR_IS_DEVICE(path,errcode) \ do { \ if (strncmp ((path), "/dev/", 5) == 0) \ - IS_DEVICE ((path),(errcode)); \ + RESOLVE_DEVICE ((path), return errcode); \ else { \ NEED_ROOT ((errcode)); \ ABS_PATH ((path),(errcode)); \ diff --git a/daemon/sfdisk.c b/daemon/sfdisk.c index 693e89a..cf62f51 100644 --- a/daemon/sfdisk.c +++ b/daemon/sfdisk.c @@ -53,7 +53,7 @@ sfdisk (char *device, int n, int cyls, int heads, int sectors, if (extra_flag) sprintf (buf + strlen (buf), " %s", extra_flag);
- /* Safe because of IS_DEVICE above: */ + /* Safe because of RESOLVES_DEVICE above: */ sprintf (buf + strlen (buf), " %s", device);
if (verbose) -- 1.6.4.337.g5420e
Looks good, ACK. Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones New in Fedora 11: Fedora Windows cross-compiler. Compile Windows programs, test, and build Windows installers. Over 70 libraries supprt'd http://fedoraproject.org/wiki/MinGW http://www.annexia.org/fedora_mingw