Fix typos in one of the XFree86 header files which corrupted the return

from getpwuid, causing the GetRootDirName function to segfault during
initialization of the screen database.

PR:		ports/23500
Submitted by:	Brian McDonald <brianmcd@columbus.rr.com>
This commit is contained in:
Jean-Marc Zucconi 2000-12-12 22:38:58 +00:00
parent f8dfc99c8a
commit 9fa59ff156
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=35935
2 changed files with 31 additions and 1 deletions

View file

@ -7,7 +7,7 @@
PORTNAME= XFree86
PORTVERSION= 3.3.6
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XFREE}
MASTER_SITE_SUBDIR= ${PORTVERSION}

30
x11/XFree86/files/patch-t Normal file
View file

@ -0,0 +1,30 @@
--- include/Xos_r.h.orig Tue Dec 12 00:07:42 2000
+++ include/Xos_r.h Tue Dec 12 00:09:15 2000
@@ -248,7 +248,7 @@
((p).len = strlen((p).pwp->pw_passwd)), \
strcpy((p).pws.pw_passwd,(p).pwp->pw_passwd), \
\
- ((p).pws.pw_class = (p).pws.pw_class + (p).len + 1), \
+ ((p).pws.pw_class = (p).pws.pw_passwd + (p).len + 1), \
((p).len = strlen((p).pwp->pw_class)), \
strcpy((p).pws.pw_class, (p).pwp->pw_class), \
\
@@ -256,7 +256,7 @@
((p).len = strlen((p).pwp->pw_gecos)), \
strcpy((p).pws.pw_gecos, (p).pwp->pw_gecos), \
\
- ((p).pws.pw_dir = (p).pws.pw_class + (p).len + 1), \
+ ((p).pws.pw_dir = (p).pws.pw_gecos + (p).len + 1), \
((p).len = strlen((p).pwp->pw_dir)), \
strcpy((p).pws.pw_dir, (p).pwp->pw_dir), \
\
@@ -289,7 +289,7 @@
((p).len = strlen((p).pwp->pw_gecos)), \
strcpy((p).pws.pw_gecos, (p).pwp->pw_gecos), \
\
- ((p).pws.pw_dir = (p).pws.pw_comment + (p).len + 1), \
+ ((p).pws.pw_dir = (p).pws.pw_gecos + (p).len + 1), \
((p).len = strlen((p).pwp->pw_dir)), \
strcpy((p).pws.pw_dir, (p).pwp->pw_dir), \
\