mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-03-09 15:50:02 +00:00
dtlogin: fix implicit-function-declaration warnings
This commit is contained in:
parent
abb408b24f
commit
47348e59de
15 changed files with 124 additions and 71 deletions
|
@ -64,6 +64,9 @@
|
||||||
#include "rgy_base.h"
|
#include "rgy_base.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(HAS_PAM_LIBRARY)
|
||||||
|
# include <pam_svc.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
*
|
*
|
||||||
|
@ -293,7 +296,12 @@ Account( struct display *d, char *user, char *line, pid_t pid,
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HAS_PAM_LIBRARY
|
#ifdef HAS_PAM_LIBRARY
|
||||||
(void) time(&u->ut_tv);
|
{
|
||||||
|
struct timeval tmp_tv;
|
||||||
|
(void) gettimeofday(&tmp_tv, NULL);
|
||||||
|
u->ut_tv.tv_sec = (int32_t)tmp_tv.tv_sec;
|
||||||
|
u->ut_tv.tv_usec = (int32_t)tmp_tv.tv_usec;
|
||||||
|
}
|
||||||
#else
|
#else
|
||||||
(void) time(&u->ut_time);
|
(void) time(&u->ut_time);
|
||||||
#endif
|
#endif
|
||||||
|
@ -503,4 +511,3 @@ struct lastlogin * llogin;
|
||||||
enduserdb();
|
enduserdb();
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -70,6 +70,11 @@
|
||||||
|
|
||||||
static char *Print8Address (ARRAY8Ptr Address);
|
static char *Print8Address (ARRAY8Ptr Address);
|
||||||
|
|
||||||
|
int LoadXloginResources(struct display *d); // session.c
|
||||||
|
void GetSysParms(char **tzpp, char **fhpp, char **ftpp); // fontpath.c
|
||||||
|
int GetChooserAddr(char *addr, int *lenp); // socket.c
|
||||||
|
int NetaddrFamily(XdmcpNetaddr netaddrp); // netaddr.c
|
||||||
|
|
||||||
|
|
||||||
static int
|
static int
|
||||||
FormatBytes (
|
FormatBytes (
|
||||||
|
|
|
@ -209,6 +209,12 @@ static int pingTry;
|
||||||
static XdmcpBuffer directBuffer, broadcastBuffer;
|
static XdmcpBuffer directBuffer, broadcastBuffer;
|
||||||
static XdmcpBuffer buffer;
|
static XdmcpBuffer buffer;
|
||||||
|
|
||||||
|
// dtchooser.c
|
||||||
|
void MakeBackground(void);
|
||||||
|
void MakeButtons(void);
|
||||||
|
void MakeChooser(void);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* ARGSUSED */
|
/* ARGSUSED */
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -142,6 +142,9 @@ int TitleLen;
|
||||||
|
|
||||||
static int parent_pid = -1; /* PID of parent dtlogin process */
|
static int parent_pid = -1; /* PID of parent dtlogin process */
|
||||||
|
|
||||||
|
void init_session_id(void); // xdmcp.c
|
||||||
|
void RunChooser(struct display *d); // RunChooser.c
|
||||||
|
|
||||||
|
|
||||||
/***************************************************************************/
|
/***************************************************************************/
|
||||||
|
|
||||||
|
|
|
@ -38,6 +38,7 @@
|
||||||
# include "dm.h"
|
# include "dm.h"
|
||||||
# include <signal.h>
|
# include <signal.h>
|
||||||
# include <X11/Xatom.h>
|
# include <X11/Xatom.h>
|
||||||
|
# include <X11/Xmu/Error.h>
|
||||||
# include <setjmp.h>
|
# include <setjmp.h>
|
||||||
#if defined(__FreeBSD__) && OSMAJORVERSION > 8
|
#if defined(__FreeBSD__) && OSMAJORVERSION > 8
|
||||||
# include <utmpx.h>
|
# include <utmpx.h>
|
||||||
|
@ -57,6 +58,8 @@ static int PathInPList(char *path, char **fplist, int listlen);
|
||||||
static int PathInZList(char *path, char *fplist, int listlen);
|
static int PathInZList(char *path, char *fplist, int listlen);
|
||||||
static int SeparateParts( char **path );
|
static int SeparateParts( char **path );
|
||||||
|
|
||||||
|
void GenerateAuthData(char *auth, int len); // genauth.c
|
||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
DebugFontPath(char *note, char **path, int nelems)
|
DebugFontPath(char *note, char **path, int nelems)
|
||||||
|
|
|
@ -94,7 +94,6 @@ from the X Consortium.
|
||||||
# include <X11/Xauth.h>
|
# include <X11/Xauth.h>
|
||||||
# include <X11/Xos.h>
|
# include <X11/Xos.h>
|
||||||
# include "dm.h"
|
# include "dm.h"
|
||||||
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
||||||
#ifdef X_NOT_STDC_ENV
|
#ifdef X_NOT_STDC_ENV
|
||||||
|
@ -131,11 +130,16 @@ static int sumFile (char *name, long sum[2]);
|
||||||
|
|
||||||
#ifdef HASXDMAUTH
|
#ifdef HASXDMAUTH
|
||||||
|
|
||||||
|
// Most of this comes from XDMCP's Wrap.h header
|
||||||
|
|
||||||
typedef unsigned char auth_cblock[8]; /* block size */
|
typedef unsigned char auth_cblock[8]; /* block size */
|
||||||
|
|
||||||
typedef struct auth_ks_struct { auth_cblock _; } auth_wrapper_schedule[16];
|
typedef struct auth_ks_struct { auth_cblock _; } auth_wrapper_schedule[16];
|
||||||
|
|
||||||
extern void _XdmcpWrapperToOddParity();
|
void _XdmcpWrapperToOddParity();
|
||||||
|
void _XdmcpAuthSetup (auth_cblock key, auth_wrapper_schedule schedule);
|
||||||
|
void _XdmcpAuthDoIt (auth_cblock input, auth_cblock output,
|
||||||
|
auth_wrapper_schedule schedule, int edflag);
|
||||||
|
|
||||||
static void
|
static void
|
||||||
longtochars (long l, unsigned char *c)
|
longtochars (long l, unsigned char *c)
|
||||||
|
|
|
@ -92,6 +92,8 @@ from the X Consortium.
|
||||||
static char auth_name[256];
|
static char auth_name[256];
|
||||||
static int auth_name_len;
|
static int auth_name_len;
|
||||||
|
|
||||||
|
void GenerateAuthData (char *auth, int len); // genauth.c
|
||||||
|
|
||||||
#if NeedWidePrototypes
|
#if NeedWidePrototypes
|
||||||
int MitInitAuth (unsigned int name_len, char *name)
|
int MitInitAuth (unsigned int name_len, char *name)
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -61,6 +61,8 @@
|
||||||
static char * getFullFileName(char *name, int special, char * lang);
|
static char * getFullFileName(char *name, int special, char * lang);
|
||||||
extern char * qualifyWithFirst(char *, char *);
|
extern char * qualifyWithFirst(char *, char *);
|
||||||
|
|
||||||
|
void GetSysParms(char **tzpp, char **fhpp, char **ftpp); // fontpath.c
|
||||||
|
|
||||||
/* XtOffset() hack for ibmrt BandAidCompiler */
|
/* XtOffset() hack for ibmrt BandAidCompiler */
|
||||||
|
|
||||||
int session_set = False;
|
int session_set = False;
|
||||||
|
|
|
@ -65,6 +65,7 @@
|
||||||
# include "vgmsg.h"
|
# include "vgmsg.h"
|
||||||
# include <signal.h>
|
# include <signal.h>
|
||||||
# include <X11/Xatom.h>
|
# include <X11/Xatom.h>
|
||||||
|
# include <X11/Xmu/Error.h>
|
||||||
# include <setjmp.h>
|
# include <setjmp.h>
|
||||||
#if defined(__FreeBSD__) && OSMAJORVERSION > 8 || defined(HAS_PAM_LIBRARY)
|
#if defined(__FreeBSD__) && OSMAJORVERSION > 8 || defined(HAS_PAM_LIBRARY)
|
||||||
# include <utmpx.h>
|
# include <utmpx.h>
|
||||||
|
@ -76,6 +77,7 @@
|
||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
#include <grp.h>
|
||||||
|
|
||||||
#ifdef SIA
|
#ifdef SIA
|
||||||
#include <sia.h>
|
#include <sia.h>
|
||||||
|
@ -110,6 +112,8 @@
|
||||||
#include <PamSvc.h>
|
#include <PamSvc.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
int ApplyFontPathMods(struct display *d, Display *dpy); // fontpath.c
|
||||||
|
|
||||||
#ifdef SIA
|
#ifdef SIA
|
||||||
|
|
||||||
static SIAENTITY *siaHandle = NULL;
|
static SIAENTITY *siaHandle = NULL;
|
||||||
|
@ -221,6 +225,7 @@ static int session_execve(char *path, char *argv[], char *envp[]);
|
||||||
static void LoadAltDtsResources( struct display *d);
|
static void LoadAltDtsResources( struct display *d);
|
||||||
char * _ExpandLang(char *string, char *lang);
|
char * _ExpandLang(char *string, char *lang);
|
||||||
|
|
||||||
|
void freeEnv (char **env); // util.c
|
||||||
|
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
|
@ -265,7 +270,7 @@ catchAlrm( int arg )
|
||||||
|
|
||||||
#if defined(__STDC__)
|
#if defined(__STDC__)
|
||||||
static int
|
static int
|
||||||
FileNameCompare (const char *a, const char *b)
|
FileNameCompare (const void *a, const void *b)
|
||||||
#else
|
#else
|
||||||
static int
|
static int
|
||||||
FileNameCompare (char *a, char *b)
|
FileNameCompare (char *a, char *b)
|
||||||
|
|
|
@ -105,6 +105,9 @@ extern int chooserFd;
|
||||||
extern FD_TYPE WellKnownSocketsMask;
|
extern FD_TYPE WellKnownSocketsMask;
|
||||||
extern int WellKnownSocketsMax;
|
extern int WellKnownSocketsMax;
|
||||||
|
|
||||||
|
void registerHostname (char *name, int namelen); // xdmcp.c
|
||||||
|
|
||||||
|
|
||||||
int
|
int
|
||||||
CreateWellKnownSockets (void)
|
CreateWellKnownSockets (void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -86,6 +86,7 @@
|
||||||
|
|
||||||
#if defined(PAM) || defined(HAS_PAM_LIBRARY)
|
#if defined(PAM) || defined(HAS_PAM_LIBRARY)
|
||||||
#include <security/pam_appl.h>
|
#include <security/pam_appl.h>
|
||||||
|
#include "pam_svc.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _AIX
|
#ifdef _AIX
|
||||||
|
|
|
@ -59,14 +59,13 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
#include <Dt/MsgCatP.h>
|
#include <Dt/MsgCatP.h>
|
||||||
|
#include <X11/Xutil.h>
|
||||||
|
#include <X11/Intrinsic.h>
|
||||||
|
#include <X11/StringDefs.h>
|
||||||
|
#include <X11/Xmu/SysUtil.h>
|
||||||
|
#include <Dt/HourGlass.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
|
|
||||||
# ifndef NULL
|
|
||||||
# define NULL 0
|
|
||||||
# endif
|
|
||||||
|
|
||||||
|
|
||||||
# include "dm.h"
|
# include "dm.h"
|
||||||
# include "vgmsg.h"
|
# include "vgmsg.h"
|
||||||
nl_catd nl_fd = (nl_catd)-1; /* message catalog file descriptor */
|
nl_catd nl_fd = (nl_catd)-1; /* message catalog file descriptor */
|
||||||
|
@ -838,4 +837,3 @@ localHostname (void)
|
||||||
}
|
}
|
||||||
return localHostbuf;
|
return localHostbuf;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -67,6 +67,8 @@
|
||||||
#include <Xm/TextFP.h>
|
#include <Xm/TextFP.h>
|
||||||
#include <Xm/PushBG.h>
|
#include <Xm/PushBG.h>
|
||||||
#include <Xm/ToggleBG.h>
|
#include <Xm/ToggleBG.h>
|
||||||
|
#include <Xm/RowColumn.h>
|
||||||
|
#include <X11/Xlib.h>
|
||||||
#include <Dt/IconFile.h>
|
#include <Dt/IconFile.h>
|
||||||
#include <Dt/Icon.h>
|
#include <Dt/Icon.h>
|
||||||
#include <pwd.h>
|
#include <pwd.h>
|
||||||
|
@ -1069,7 +1071,7 @@ PostMenuCB( Widget w, XtPointer client_data, XtPointer call_data )
|
||||||
if (p->reason == XmCR_ARM &&
|
if (p->reason == XmCR_ARM &&
|
||||||
p->event->type == ButtonPress) {
|
p->event->type == ButtonPress) {
|
||||||
|
|
||||||
XmMenuPosition(options_menu, p->event);
|
XmMenuPosition(options_menu, (XButtonPressedEvent *)p->event);
|
||||||
XtManageChild(options_menu);
|
XtManageChild(options_menu);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -94,6 +94,8 @@ from the X Consortium.
|
||||||
static char auth_name[256];
|
static char auth_name[256];
|
||||||
static int auth_name_len;
|
static int auth_name_len;
|
||||||
|
|
||||||
|
void GenerateAuthData(char *auth, int len); // genauth.c
|
||||||
|
|
||||||
void
|
void
|
||||||
XdmPrintDataHex(const char *s, const char *a, int l)
|
XdmPrintDataHex(const char *s, const char *a, int l)
|
||||||
{
|
{
|
||||||
|
|
|
@ -141,6 +141,16 @@ int WellKnownSocketsMax;
|
||||||
|
|
||||||
#define pS(s) ((s) ? ((char *) (s)) : "empty string")
|
#define pS(s) ((s) ? ((char *) (s)) : "empty string")
|
||||||
|
|
||||||
|
/* choose.c */
|
||||||
|
int RememberIndirectClient(ARRAY8Ptr clientAddress, CARD16 connectionType);
|
||||||
|
void ForgetIndirectClient(ARRAY8Ptr clientAddress, CARD16 connectionType);
|
||||||
|
int IsIndirectClient(ARRAY8Ptr clientAddress, CARD16 connectionType);
|
||||||
|
ARRAY8Ptr IndirectChoice(ARRAY8Ptr clientAddress, CARD16 connectionType);
|
||||||
|
int ProcessChooserSocket(int fd);
|
||||||
|
void RunChooser(struct display *d);
|
||||||
|
|
||||||
|
void LoadDMResources(void); // resource.c
|
||||||
|
|
||||||
void
|
void
|
||||||
DestroyWellKnownSockets (void)
|
DestroyWellKnownSockets (void)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue