debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove UXPDS support

Browse Source
This commit is contained in:
chase
2018-05-15 20:11:08 -05:00
committed by Jon Trulson
parent 0f8233dadd
commit 8a4f389634
319 changed files with 317 additions and 8776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cde/programs/dtlogin/Imakefile
View File

@@ -119,10 +119,6 @@ SYS_LIBRARIES = -lm -ldl -lgen -lresolv -lbsm -lcmd $(PAM_LIB)
SYS_LIBRARIES = -lm -ldl -lgen -lresolv
#endif
#if defined(UXPArchitecture)
SYS_LIBRARIES = -lm -ldl -lgen -lresolv
#endif
#if defined(RsArchitecture)
SYS_LIBRARIES = -ls
#endif
@@ -340,15 +336,6 @@ EXTRA_RES_DEFINES = \
# endif
#endif
#if defined(UXPArchitecture)
# if HasSharedLibraries
BASE_LIBS1 = $(XAUTHLIB) $(LOGINXMULIB) $(XDMCPLIB) $(XTOOLLIB) \
$(LOGINXLIB)
BASE_LIBS2 = $(DTWIDGETLIB) $(DTSVCLIB) $(TTLIB) \
$(XMLIB) $(XTOOLLIB) $(XLIB)
# endif
#endif
/**************************************************************************

22
cde/programs/dtlogin/config/Xresources.src
View File

@@ -452,28 +452,6 @@ Dtlogin*tr_TR.ISO8859-9.languageName: %|nls-447-#Turkish#|
#endif /* __osf__ */
#if defined (__uxp__)
!!######################################################################
!!
!! LANGUAGE MENU NAME MAPPINGS
#undef C
XCOMM undef C
Dtlogin*C.languageName: %|nls-500-##|
Dtlogin*POSIX.languageName: %|nls-501-##|
Dtlogin*iso_8859_1.languageName: %|nls-502-##|
Dtlogin*ja.languageName: %|nls-503-##|
Dtlogin*ja_JP.languageName: %|nls-504-##|
Dtlogin*ja_JP.EUC.languageName: %|nls-505-##|
Dtlogin*ja_JP.S90.languageName: %|nls-506-##|
Dtlogin*ja_JP.SJIS.languageName: %|nls-507-##|
Dtlogin*ja_JP.U90.languageName: %|nls-508-##|
Dtlogin*ja_JP.eucJP.languageName: %|nls-509-##|
Dtlogin*japan.languageName: %|nls-510-##|
#endif /* __uxp__ */
#if defined (USL)
!!######################################################################
!!

2
cde/programs/dtlogin/config/Xservers.src
View File

@@ -109,8 +109,6 @@ XCOMM * Local local_uid@console root /usr/bin/X11/X :0 -nice -2
* Local local@console /usr/bin/X11/X :0
#elif defined (_NO_CONSOLE)
XCOMM * Local local@console /usr/bin/X11/X :0
#elif defined (__uxp__)
:0 Local local@console /usr/bin/X11/X :0
#elif defined (linux)
:0 Local local_uid@tty1 root /usr/bin/X :0
#elif defined (__OpenBSD__)

4
cde/programs/dtlogin/config/Xsession.src
View File

@@ -357,7 +357,7 @@ XCOMM ##########################################################################
dtdbcacherm="rm -f /tmp/dtdbcache_$DISPLAY"
#endif
dtstart_appgather="$DT_BINPATH/dtappgather &"
#if defined(USL) || defined(sun) || defined(__uxp__)
#if defined(USL) || defined(sun)
dtstart_dsdm="$DT_BINPATH/dsdm &"
#endif
@@ -564,7 +564,7 @@ StartFirst()
tooltalk=$(GetFirst dtstart_ttsession) # get tooltalk client
dtdbcache=$(GetFirst dtstart_dtdbcache) # get dtdbcache client
#if defined(USL) || defined(sun) || defined(__uxp__)
#if defined(USL) || defined(sun)
if [ -z "$SDT_NO_DSDM" ]; then
StartFirst dtstart_dsdm # start drag and drop proxy
fi

10
cde/programs/dtlogin/dm.c
View File

@@ -92,7 +92,7 @@
*
***************************************************************************/
#if defined(USL) || defined(__uxp__)
#if defined(USL)
extern int makepttypair ();
#endif
@@ -182,7 +182,7 @@ main( int argc, char **argv )
if ( (progName = malloc(strlen(argv[0]) + 1)) != NULL )
strcpy(progName, argv[0]);
#if defined(USL) || defined(__uxp__)
#if defined(USL)
/* create master slave pair for use in login */
if (makepttypair () < 0)
{
@@ -294,7 +294,7 @@ main( int argc, char **argv )
ScanServers ();
StartDisplays ();
(void) signal (SIGHUP, RescanNotify);
#if !defined(SYSV) || defined(hpux) || defined(_AIX) || defined(__uxp__)|| defined (__osf__) || defined(linux)
#if !defined(SYSV) || defined(hpux) || defined(_AIX) || defined (__osf__) || defined(linux)
(void) signal (SIGCHLD, ChildNotify);
#endif
while (AnyWellKnownSockets() || AnyDisplaysLeft ())
@@ -307,7 +307,7 @@ main( int argc, char **argv )
TrimErrorFile();
#if defined(SYSV) && !defined(hpux) && !defined(_AIX) && !defined(__uxp__) && !defined (__osf__) && !defined(linux)
#if defined(SYSV) && !defined(hpux) && !defined(_AIX) && !defined (__osf__) && !defined(linux)
WaitForChild ();
#else
WaitForSomething ();
@@ -521,7 +521,7 @@ StopAll( int arg )
int ChildReady = 0;
#if !defined(SYSV) || defined(hpux) || defined(_AIX) || defined(__uxp__) || defined (__osf__) || defined(linux) || defined(CSRG_BASED)
#if !defined(SYSV) || defined(hpux) || defined(_AIX) || defined (__osf__) || defined(linux) || defined(CSRG_BASED)
static SIGVAL
ChildNotify( int arg )
{

2
cde/programs/dtlogin/dm.h
View File

@@ -117,7 +117,7 @@
#define DEF_NLS_DIR "/usr/lib/nls/loc"
#elif defined(hpV4)
#define DEF_NLS_DIR "/usr/lib/nls/msg"
#elif defined(__uxp__) || defined(USL)
#elif defined(USL)
#define DEF_NLS_DIR "/usr/lib/locale"
#else
#define DEF_NLS_DIR CDE_INSTALLATION_TOP "/lib/nls/msg"

2
cde/programs/dtlogin/session.c
View File

@@ -1625,7 +1625,7 @@ StartClient( struct verify_info *verify, struct display *d, int *pidp )
failsafeArgv[i++] = "/usr/bin/X11/aixterm";
#elif defined(sun)
failsafeArgv[i++] = "/usr/openwin/bin/xterm";
#elif defined (USL) || defined(__uxp__)
#elif defined (USL)
failsafeArgv[i++] = "/usr/X/bin/xterm";
#elif defined(__hpux)
failsafeArgv[i++] = "/usr/bin/X11/hpterm";

260
cde/programs/dtlogin/sysauth.c
View File

@@ -71,7 +71,6 @@
** SVR4 SUN OS and USL
** _AIX AIX only
** _POWER AIX version 4 only
** __uxp__ Fujitsu UXP/DS
**
****************************************************************************
************************************<+>*************************************/
@@ -105,7 +104,7 @@
/* necessary for bzero */
#ifdef SVR4
#include <X11/Xfuncs.h>
#if defined(sun) || defined(__uxp__)
#if defined(sun)
#include <shadow.h>
#endif
#endif
@@ -126,7 +125,6 @@
defined(__apollo) || \
defined(_AIX) || \
defined(sun) || \
defined(__uxp__) || \
defined(USL))
#define generic
#endif
@@ -1068,262 +1066,6 @@ WriteBtmp( char *name )
#endif /* __hpux */
/***************************************************************************
***************************************************************************
***************************************************************************
***************************************************************************
***************************************************************************
***************************************************************************
***************************************************************************
***************************************************************************/
#if defined(__uxp__)
/***************************************************************************
*
* Start authentication routines (UXP)
*
***************************************************************************/
/***************************************************************************
*
* External declarations (UXP)
*
***************************************************************************/
/***************************************************************************
*
* Procedure declarations (UXP)
*
***************************************************************************/
static void Audit( struct passwd *p, char *msg, int errnum) ;
static int PasswordAged( register struct passwd *pw) ;
static void WriteBtmp( char *name) ;
/***************************************************************************
*
* Global variables (UXP)
*
***************************************************************************/
/***************************************************************************
*
* Audit (UXP)
*
***************************************************************************/
static void
Audit( struct passwd *p, char *msg, int errnum )
{
/*
* make sure program is back to super-user...
*/
seteuid(0);
return;
}
/***************************************************************************
*
* WriteBtmp (UXP)
*
* log bad login attempts
*
***************************************************************************/
static void
WriteBtmp( char *name )
{
return;
}
/***************************************************************************
*
* PasswordAged (UXP)
*
* see if password has aged
***************************************************************************/
#define SECONDS_IN_WEEK 604800L
static int
PasswordAged( register struct passwd *pw )
{
long change_week; /* week password was changed (1/1/70 = Week 0) */
long last_week; /* week after which password must change */
long first_week; /* week before which password can't change */
long this_week; /* this week derived from time() */
char *file; /* help file name */
char *command; /* the /bin/passwd command string */
if (*pw->pw_age == NULL)
return(0);
first_week = last_week = change_week = (long) a64l(pw->pw_age);
last_week &= 0x3f; /* first six bits */
first_week = (first_week >> 6) & 0x3f; /* next six bits */
change_week >>= 12; /* everything else */
this_week = (long) time((long *) 0) / SECONDS_IN_WEEK;
/*
** Password aging conditions:
** * if the last week is less than the first week (e.g., the aging
** field looks like "./"), only the superuser can change the
** password. We don't request a new password.
** * if the week the password was last changed is after this week,
** we have a problem, and request a new password.
** * if this week is after the specified aging time, we request
** a new password.
*/
if (last_week < first_week)
return(0);
if (change_week <= this_week && this_week <= (change_week + last_week))
return(0);
return(1);
}
/***************************************************************************
*
* Authenticate (UXP)
*
* verify the user
*
* return codes indicate authentication results.
***************************************************************************/
#define MAXATTEMPTS 3
struct passwd nouser = {"", "nope"}; /* invalid user password struct */
int
Authenticate( struct display *d, char *name, char *passwd, char **msg )
{
static int login_attempts = 0; /* # failed authentications */
struct passwd *p; /* password structure */
struct spwd *sp; /* shadow info */
char *crypt();
int n;
char *origpw;
/*
* Nothing to do if no name provided.
*/
if (!name)
return(VF_INVALID);
/*
* Save provided password.
*/
origpw = passwd;
if (!passwd) passwd = "";
p = getpwnam(name);
sp = getspnam(name);
if (!p || strlen(name) == 0 ||
strcmp (crypt (passwd, sp->sp_pwdp), sp->sp_pwdp)) {
WriteBtmp(name);
if ((++login_attempts % MAXATTEMPTS) == 0 ) {
if (p == NULL )
p = &nouser;
Audit(p, " Failed login (bailout)", 1);
}
return(origpw ? VF_INVALID : VF_CHALLENGE);
}
/*
* check password aging...
*/
if ( PasswordAged(p) ) return(VF_PASSWD_AGED);
/*
* verify home directory exists...
*/
if(chdir(p->pw_dir) < 0) {
Audit(p, " attempted to login - no home directory", 1);
return(VF_HOME);
}
/*
* validate uid and gid...
*/
if ((p->pw_gid < 0) ||
(setgid(p->pw_gid) == -1)) {
Audit(p, " attempted to login - bad group id", 1);
return(VF_BAD_GID);
}
if ((p->pw_uid < 0) ||
(seteuid(p->pw_uid) == -1)) {
Audit(p, " attempted to login - bad user id", 1);
return(VF_BAD_UID);
}
/*
* verify ok...
*/
Audit(p, " Successful login", 0);
return(VF_OK);
}
/***************************************************************************
*
* End authentication routines (UXP)
*
***************************************************************************/
#endif
/***************************************************************************
***************************************************************************
***************************************************************************

4
cde/programs/dtlogin/usl_ptty.c
View File

@@ -31,7 +31,7 @@
#include <stdio.h> /* just so file isn't empty */
#if defined (USL) || defined(__uxp__)
#if defined (USL)
#include <sys/byteorder.h>
#include <termio.h>
@@ -157,4 +157,4 @@ makepttypair()
return(0);
}
#endif /* USL || __uxp__ */
#endif /* USL */

8
cde/programs/dtlogin/util.c
View File

@@ -349,7 +349,7 @@ CleanUpChild( void )
sigsetmask(0);
#else
#if defined (SYSV) || defined (SVR4) || defined(linux)
#if !defined (USL) && !defined(__uxp__)
#if !defined (USL)
setpgrp ();
#endif /* USL */
#else
@@ -951,7 +951,7 @@ ScanNLSDir(char *dirname)
}
#endif /* __osf__obsoleted__ */
#elif defined(__uxp__) || defined(USL)
#elif defined(USL)
#define LC_COLLATE "LC_COLLATE"
#define LC_CTYPE "LC_CTYPE"
@@ -961,7 +961,7 @@ ScanNLSDir(char *dirname)
#define LC_TIME "LC_TIME"
/*
* Scan for installed locales on Fujitsu and Novell/SCO platforms.
* Scan for installed locales on Novell/SCO platforms.
*/
{
DIR *nls_dirp, *locale_dirp;
@@ -1027,7 +1027,7 @@ ScanNLSDir(char *dirname)
}
}
#else /* !_AIX && !hpV4 && !__osf__ !sun && !USL && !__uxp__ */
#else /* !_AIX && !hpV4 && !__osf__ !sun && !USL */
/*
* Scan for installed locales on generic platform
*/