summaryrefslogtreecommitdiff
path: root/sftp-common.c
diff options
context:
space:
mode:
authormillert@openbsd.org <millert@openbsd.org>2018-09-13 15:23:32 +0000
committerDamien Miller <djm@mindrot.org>2018-09-14 12:49:29 +1000
commit488c9325bb7233e975dbfbf89fa055edc3d3eddc (patch)
tree5bd2db9b6885bbae81b535b34ae51874b14dc905 /sftp-common.c
parent0aa1f230846ebce698e52051a107f3127024a05a (diff)
upstream: Fix warnings caused by user_from_uid() and group_from_gid()
now returning const char *. OpenBSD-Commit-ID: b5fe571ea77cfa7b9035062829ab05eb87d7cc6f
Diffstat (limited to 'sftp-common.c')
-rw-r--r--sftp-common.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sftp-common.c b/sftp-common.c
index 13a7f5bec..5d743d3b2 100644
--- a/sftp-common.c
+++ b/sftp-common.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp-common.c,v 1.30 2017/06/10 06:36:46 djm Exp $ */ 1/* $OpenBSD: sftp-common.c,v 1.31 2018/09/13 15:23:32 millert Exp $ */
2/* 2/*
3 * Copyright (c) 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2001 Markus Friedl. All rights reserved.
4 * Copyright (c) 2001 Damien Miller. All rights reserved. 4 * Copyright (c) 2001 Damien Miller. All rights reserved.
@@ -215,7 +215,7 @@ ls_file(const char *name, const struct stat *st, int remote, int si_units)
215{ 215{
216 int ulen, glen, sz = 0; 216 int ulen, glen, sz = 0;
217 struct tm *ltime = localtime(&st->st_mtime); 217 struct tm *ltime = localtime(&st->st_mtime);
218 char *user, *group; 218 const char *user, *group;
219 char buf[1024], lc[8], mode[11+1], tbuf[12+1], ubuf[11+1], gbuf[11+1]; 219 char buf[1024], lc[8], mode[11+1], tbuf[12+1], ubuf[11+1], gbuf[11+1];
220 char sbuf[FMT_SCALED_STRSIZE]; 220 char sbuf[FMT_SCALED_STRSIZE];
221 time_t now; 221 time_t now;