[Xorg-commit] xc/programs/xdm/greeter Imakefile,1.1.4.2,1.1.4.3 verify.c,1.1.4.2,1.1.4.3

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/programs/xdm/greeter
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/programs/xdm/greeter

Modified Files:
      Tag: XORG-CURRENT
	Imakefile verify.c 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/xdm/greeter/Imakefile,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/Imakefile	26 Nov 2003 22:49:11 -0000	1.1.4.2
+++ b/Imakefile	23 Feb 2004 21:37:45 -0000	1.1.4.3
@@ -3,7 +3,7 @@
 
 
 
-XCOMM $XFree86: xc/programs/xdm/greeter/Imakefile,v 1.8 2003/05/27 22:27:00 tsi Exp $
+XCOMM $XFree86: xc/programs/xdm/greeter/Imakefile,v 1.9 2004/01/03 16:19:58 herrb Exp $
 
 #define DoNormalLib NO
 #define DoSharedLib YES
@@ -38,7 +38,7 @@
 #endif
 
 #ifdef SharedXmuReqs			/* do we support required libs? */
-REQUIREDLIBS = SharedXmuReqs
+REQUIREDLIBS = SharedXmuReqs $(XPMLIB)
 #endif
 
 #ifdef OSF1Architecture
@@ -84,6 +84,10 @@
 	   $(KRBIV_DEFINES) $(KRB5_DEFINES) $(PWD_DEFINES) $(PAM_DEFINES) \
 	   $(XKB_CLIENT_DEFINES) $(XPM_DEFINES)
 
+XCOMM Override SHLIBDIR so that shared library is installed in XDMDIR instead
+XCOMM of default shared library directory
+SHLIBDIR = $(XDMDIR)
+
 SRCS = greet.c verify.c Login.c
 OBJS = greet.o verify.o Login.o
 

Index: verify.c
===================================================================
RCS file: /cvs/xorg/xc/programs/xdm/greeter/verify.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/verify.c	26 Nov 2003 22:49:11 -0000	1.1.4.2
+++ b/verify.c	23 Feb 2004 21:37:45 -0000	1.1.4.3
@@ -26,7 +26,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xdm/greeter/verify.c,v 3.26 2003/11/19 04:44:00 dawes Exp $ */
+/* $XFree86: xc/programs/xdm/greeter/verify.c,v 3.27 2004/01/25 01:12:25 dawes Exp $ */
 
 /*
  * xdm - display manager daemon
@@ -41,14 +41,17 @@
 #include	"dm_error.h"
 
 #include	<pwd.h>
-#ifdef USE_PAM
+
+#if defined(USE_PAM)
 # include	<security/pam_appl.h>
 # include	<stdlib.h>
-#else
-# ifdef USESHADOW
-#  include	<shadow.h>
-#  include	<errno.h>
-# endif
+#elif defined(USESHADOW)
+# include	<shadow.h>
+# include	<errno.h>
+#elif defined(USE_BSDAUTH)
+# include	<login_cap.h>
+# include	<varargs.h>
+# include	<bsd_auth.h>
 #endif
 
 # include	"greet.h"