diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-10-17 12:15:23 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-10-17 12:15:23 +0800 |
| commit | 8385dca8d591541229649df5882a0f01924dc358 (patch) | |
| tree | eb461b676610aa33e81d073925d2b02066f6dc9e | |
| parent | 81063ad07117c7b636056946e75ad49b279cde5a (diff) | |
| download | marcuscom-ports-8385dca8d591541229649df5882a0f01924dc358.tar marcuscom-ports-8385dca8d591541229649df5882a0f01924dc358.tar.gz marcuscom-ports-8385dca8d591541229649df5882a0f01924dc358.tar.bz2 marcuscom-ports-8385dca8d591541229649df5882a0f01924dc358.tar.lz marcuscom-ports-8385dca8d591541229649df5882a0f01924dc358.tar.xz marcuscom-ports-8385dca8d591541229649df5882a0f01924dc358.tar.zst marcuscom-ports-8385dca8d591541229649df5882a0f01924dc358.zip | |
Fix a dumb bug where we would not be able to detect the local user properly.
This bug was exposed when the integer overflow bug was fixed. This should
prevent g-v-m from terminating on startup.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9829 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | sysutils/gnome-volume-manager/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/gnome-volume-manager/files/patch-src_manager.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sysutils/gnome-volume-manager/Makefile b/sysutils/gnome-volume-manager/Makefile index c99c2ab6d..882eb95e7 100644 --- a/sysutils/gnome-volume-manager/Makefile +++ b/sysutils/gnome-volume-manager/Makefile @@ -3,12 +3,12 @@ # Whom: Jean-Yves Lefort <jylefort@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-volume-manager/Makefile,v 1.17 2007/05/19 21:36:23 marcus Exp $ +# $MCom: ports/sysutils/gnome-volume-manager/Makefile,v 1.18 2007/08/26 03:53:51 marcus Exp $ # PORTNAME= gnome-volume-manager PORTVERSION= 2.17.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} diff --git a/sysutils/gnome-volume-manager/files/patch-src_manager.c b/sysutils/gnome-volume-manager/files/patch-src_manager.c index 6f7256d53..13e0cbf7f 100644 --- a/sysutils/gnome-volume-manager/files/patch-src_manager.c +++ b/sysutils/gnome-volume-manager/files/patch-src_manager.c @@ -1,5 +1,5 @@ ---- src/manager.c.orig Tue Nov 7 13:01:17 2006 -+++ src/manager.c Sun Dec 31 15:33:44 2006 +--- src/manager.c.orig 2006-11-07 13:01:17.000000000 -0500 ++++ src/manager.c 2007-10-17 00:14:10.000000000 -0400 @@ -23,9 +23,12 @@ #include <sys/types.h> #include <sys/stat.h> @@ -221,7 +221,7 @@ + for (utmp = &buf[bytes / sizeof(buf[0]) - 1]; !local && utmp >= buf; --utmp) { + if (!utmp->ut_name[0] || strncmp (utmp->ut_name, user, n) != 0) + continue; -+ local = utmp->ut_line[0] == ':' && utmp->ut_line[1] >= '0' && utmp->ut_line[1] <= '9' || !strncmp (utmp->ut_line, "ttyv", 4) ? LOCAL_USER_FOUND : 0; ++ local = utmp->ut_host[0] == ':' && utmp->ut_host[1] >= '0' && utmp->ut_host[1] <= '9' || !strncmp (utmp->ut_line, "ttyv", 4) ? LOCAL_USER_FOUND : 0; + } + } + |