From 6f56ab0e42b4eea345deab075ff12f637002eb8b Mon Sep 17 00:00:00 2001 From: Ulrich Wilkens Date: Wed, 29 May 2013 00:30:06 +0200 Subject: [PATCH] Fix screen locking for BSDs --- cde/programs/dtsession/Dtsession.src | 2 ++ cde/programs/dtsession/SmMain.c | 3 +++ cde/programs/dtsession/SmScreen.c | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cde/programs/dtsession/Dtsession.src b/cde/programs/dtsession/Dtsession.src index e4f12007..ca3bd45f 100644 --- a/cde/programs/dtsession/Dtsession.src +++ b/cde/programs/dtsession/Dtsession.src @@ -23,6 +23,8 @@ XCOMM include "Dt" Dtsession*drawArea.background: black #ifdef __osf__ Dtsession*lockLabelPixmap.imageName: DECDtlogo +#elif __FreeBSD__ +Dtsession*lockLabelPixmap.imageName: FreeBSDDtlogo #else Dtsession*lockLabelPixmap.imageName: Dtlogo #endif diff --git a/cde/programs/dtsession/SmMain.c b/cde/programs/dtsession/SmMain.c index 5d94de31..3b65f753 100644 --- a/cde/programs/dtsession/SmMain.c +++ b/cde/programs/dtsession/SmMain.c @@ -101,6 +101,9 @@ static int RegisterX11ScreenSaver(Display *display, int *ssEventType); #ifdef SVR4 #define SECURE_SYS_PATH "/etc/shadow" #endif +#ifdef CSRG_BASED +#define SECURE_SYS_PATH "/etc/master.passwd" +#endif diff --git a/cde/programs/dtsession/SmScreen.c b/cde/programs/dtsession/SmScreen.c index 7c02a710..ece158a8 100644 --- a/cde/programs/dtsession/SmScreen.c +++ b/cde/programs/dtsession/SmScreen.c @@ -239,7 +239,7 @@ SmSaverParseSaverList( int i = 0; char * tmpStr; int len = strlen(saverList); - int bytes = sizeof(int); + int bytes = sizeof(long); char *p; SmSaverParseStruct *pstruct; -- 2.25.1