- djm@cvs.openbsd.org 2010/01/30 02:54:53

[openssh.git] / sftp-common.c

diff --git a/sftp-common.c b/sftp-common.c
index 7393fc6a9dd91cbf0cda4ec6e7c77147a02a56d0..a042875c69de2e011174a541c457ec6f67bc8fbb 100644 (file)
--- a/sftp-common.c
+++ b/sftp-common.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-common.c,v 1.21 2010/01/13 01:40:16 djm Exp $ */
+/* $OpenBSD: sftp-common.c,v 1.23 2010/01/15 09:24:23 markus Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2001 Damien Miller.  All rights reserved.
@@ -36,7 +36,9 @@
 #include <string.h>
 #include <time.h>
 #include <stdarg.h>
+#ifdef HAVE_UTIL_H
 #include <util.h>
+#endif
 
 #include "xmalloc.h"
 #include "buffer.h"
@@ -188,22 +190,20 @@ char *
 ls_file(const char *name, const struct stat *st, int remote, int si_units)
 {
        int ulen, glen, sz = 0;
-       struct passwd *pw;
-       struct group *gr;
        struct tm *ltime = localtime(&st->st_mtime);
        char *user, *group;
        char buf[1024], mode[11+1], tbuf[12+1], ubuf[11+1], gbuf[11+1];
        char sbuf[FMT_SCALED_STRSIZE];
 
        strmode(st->st_mode, mode);
-       if (!remote && (pw = getpwuid(st->st_uid)) != NULL) {
-               user = pw->pw_name;
+       if (!remote) {
+               user = user_from_uid(st->st_uid, 0);
        } else {
                snprintf(ubuf, sizeof ubuf, "%u", (u_int)st->st_uid);
                user = ubuf;
        }
-       if (!remote && (gr = getgrgid(st->st_gid)) != NULL) {
-               group = gr->gr_name;
+       if (!remote) {
+               group = group_from_gid(st->st_gid, 0);
        } else {
                snprintf(gbuf, sizeof gbuf, "%u", (u_int)st->st_gid);
                group = gbuf;