Use imdent to show cpp macro nesting more clearly

Also strip trailing whitespace to make git happier.
While many lines are changes, "git diff -w" shows no changes other
than pure whitespace.

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>

5 files changed, 302 insertions, 302 deletions

diff --git a/greeter/Login.c b/greeter/Login.c
index 67a3d42..4903ea2 100644
--- a/greeter/Login.c
+++ b/greeter/Login.c
@@ -61,34 +61,34 @@ from The Open Group.
  * Login.c
  */
 
-# include <X11/IntrinsicP.h>
-# include <X11/StringDefs.h>
-# include <X11/keysym.h>
-# include <X11/DECkeysym.h>
-# include <X11/Xfuncs.h>
-
-# include <stdio.h>
-# include <ctype.h>
-# include <time.h>
-# include <string.h>
-
-# include "dm.h"
-# include "dm_error.h"
-# include "greet.h"
-# include "LoginP.h"
+#include <X11/IntrinsicP.h>
+#include <X11/StringDefs.h>
+#include <X11/keysym.h>
+#include <X11/DECkeysym.h>
+#include <X11/Xfuncs.h>
+
+#include <stdio.h>
+#include <ctype.h>
+#include <time.h>
+#include <string.h>
+
+#include "dm.h"
+#include "dm_error.h"
+#include "greet.h"
+#include "LoginP.h"
 
 #ifdef XPM
-#include <sys/stat.h>
-#include <unistd.h>
-#include <X11/Xlib.h>
-#include <X11/xpm.h>
-#include <X11/extensions/shape.h>
+# include <sys/stat.h>
+# include <unistd.h>
+# include <X11/Xlib.h>
+# include <X11/xpm.h>
+# include <X11/extensions/shape.h>
 #endif /* XPM */
 
 #include <X11/cursorfont.h>
 
 #ifdef USE_XINERAMA
-#include <X11/extensions/Xinerama.h>
+# include <X11/extensions/Xinerama.h>
 #endif
 
 #ifndef DEBUG
@@ -123,7 +123,7 @@ static XtResource resources[] = {
 	goffset(x), XtRImmediate,	(XtPointer) -1},
     {XtNy, XtCY, XtRPosition, sizeof (Position),
 	goffset(y), XtRImmediate,	(XtPointer) -1},
-#ifndef USE_XFT    
+#ifndef USE_XFT
     {XtNforeground, XtCForeground, XtRPixel, sizeof(Pixel),
         offset(textpixel), XtRString,	XtDefaultForeground},
     {XtNpromptColor, XtCForeground, XtRPixel, sizeof(Pixel),
@@ -141,7 +141,7 @@ static XtResource resources[] = {
 /* end (caolan) */
 #endif /* DANCING */
 
-#ifdef XPM    
+#ifdef XPM
 /* added by Ivan Griffin (ivan.griffin@ul.ie) */
         {XtNlogoFileName, XtCLogoFileName, XtRString, sizeof(char*),
         offset(logoFileName), XtRImmediate, (XtPointer)0},
@@ -165,7 +165,7 @@ static XtResource resources[] = {
         offset(sepwidth), XtRImmediate, (XtPointer) 1},
 /* end (amit) */
 
-#ifndef USE_XFT    
+#ifndef USE_XFT
     {XtNfont, XtCFont, XtRFontStruct, sizeof (XFontStruct *),
     	offset (textFont), XtRString,	"*-new century schoolbook-medium-r-normal-*-180-*"},
     {XtNpromptFont, XtCFont, XtRFontStruct, sizeof (XFontStruct *),
@@ -240,33 +240,33 @@ static XtResource resources[] = {
 # define F_DESCENT(f)	((w)->login.f##Font->max_bounds.descent)
 #endif
 
-# define TEXT_X_INC(w)		F_MAX_WIDTH(text)
-# define TEXT_Y_INC(w)		(F_ASCENT(text) + F_DESCENT(text))
+#define TEXT_X_INC(w)		F_MAX_WIDTH(text)
+#define TEXT_Y_INC(w)		(F_ASCENT(text) + F_DESCENT(text))
 
-# define PROMPT_X_INC(w)	F_MAX_WIDTH(prompt)
-# define PROMPT_Y_INC(w)	(F_ASCENT(prompt) + F_DESCENT(prompt))
+#define PROMPT_X_INC(w)	F_MAX_WIDTH(prompt)
+#define PROMPT_Y_INC(w)	(F_ASCENT(prompt) + F_DESCENT(prompt))
 
-# define GREET_X_INC(w)		F_MAX_WIDTH(greet)
-# define GREET_Y_INC(w)		(F_ASCENT(greet) + F_DESCENT(greet))
+#define GREET_X_INC(w)		F_MAX_WIDTH(greet)
+#define GREET_Y_INC(w)		(F_ASCENT(greet) + F_DESCENT(greet))
 
-# define FAIL_X_INC(w)		F_MAX_WIDTH(fail)
-# define FAIL_Y_INC(w)		(F_ASCENT(fail) + F_DESCENT(fail))
+#define FAIL_X_INC(w)		F_MAX_WIDTH(fail)
+#define FAIL_Y_INC(w)		(F_ASCENT(fail) + F_DESCENT(fail))
 
-# define Y_INC(w)	max (TEXT_Y_INC(w), PROMPT_Y_INC(w))
+#define Y_INC(w)	max (TEXT_Y_INC(w), PROMPT_Y_INC(w))
 
 
-# define PROMPT_TEXT(w,n) 	((w)->login.prompts[n].promptText)
-# define DEF_PROMPT_TEXT(w,n) 	((w)->login.prompts[n].defaultPrompt)
-# define VALUE_TEXT(w,n) 	((w)->login.prompts[n].valueText)
-# define VALUE_TEXT_MAX(w,n)	((w)->login.prompts[n].valueTextMax)
-# define VALUE_SHOW_START(w,n)	((w)->login.prompts[n].valueShownStart)
-# define VALUE_SHOW_END(w,n)	((w)->login.prompts[n].valueShownEnd)
-# define PROMPT_STATE(w,n) 	((w)->login.prompts[n].state)
-# define PROMPT_CURSOR(w,n)	((w)->login.prompts[n].cursor)
+#define PROMPT_TEXT(w,n) 	((w)->login.prompts[n].promptText)
+#define DEF_PROMPT_TEXT(w,n) 	((w)->login.prompts[n].defaultPrompt)
+#define VALUE_TEXT(w,n) 	((w)->login.prompts[n].valueText)
+#define VALUE_TEXT_MAX(w,n)	((w)->login.prompts[n].valueTextMax)
+#define VALUE_SHOW_START(w,n)	((w)->login.prompts[n].valueShownStart)
+#define VALUE_SHOW_END(w,n)	((w)->login.prompts[n].valueShownEnd)
+#define PROMPT_STATE(w,n) 	((w)->login.prompts[n].state)
+#define PROMPT_CURSOR(w,n)	((w)->login.prompts[n].cursor)
 
-# define CUR_PROMPT_CURSOR(w)	PROMPT_CURSOR(w,w->login.activePrompt)
+#define CUR_PROMPT_CURSOR(w)	PROMPT_CURSOR(w,w->login.activePrompt)
 
-# define CUR_PROMPT_TEXT(w, n)	(PROMPT_TEXT(w,n) != NULL ? \
+#define CUR_PROMPT_TEXT(w, n)	(PROMPT_TEXT(w,n) != NULL ? \
 				 PROMPT_TEXT(w,n) : DEF_PROMPT_TEXT(w,n))
 
 #ifdef USE_XFT
@@ -295,23 +295,23 @@ XmuXftTextWidth(Display *dpy, XftFont *font, FcChar8 *string, int len);
 #endif
 
 
-# define STRING_WIDTH(f, s) 	TEXT_WIDTH (f, s, strlen(s))
+#define STRING_WIDTH(f, s) 	TEXT_WIDTH (f, s, strlen(s))
 
 
 
-# define TEXT_PROMPT_W(w, m) (STRING_WIDTH(prompt, m) + w->login.inframeswidth)
+#define TEXT_PROMPT_W(w, m) (STRING_WIDTH(prompt, m) + w->login.inframeswidth)
 
-# define DEF_PROMPT_W(w,n) TEXT_PROMPT_W(w, w->login.prompts[n].defaultPrompt)
-# define CUR_PROMPT_W(w,n)  (max(MAX_DEF_PROMPT_W(w), PROMPT_TEXT(w,n) ? \
+#define DEF_PROMPT_W(w,n) TEXT_PROMPT_W(w, w->login.prompts[n].defaultPrompt)
+#define CUR_PROMPT_W(w,n)  (max(MAX_DEF_PROMPT_W(w), PROMPT_TEXT(w,n) ? \
 		     TEXT_PROMPT_W(w, PROMPT_TEXT(w,n)) : 0))
 
-# define MAX_DEF_PROMPT_W(w) (max(DEF_PROMPT_W(w,0), DEF_PROMPT_W(w,1)))
+#define MAX_DEF_PROMPT_W(w) (max(DEF_PROMPT_W(w,0), DEF_PROMPT_W(w,1)))
 
-# define GREETING(w)	((w)->login.secure_session  && !(w)->login.allow_access ?\
+#define GREETING(w)	((w)->login.secure_session  && !(w)->login.allow_access ?\
 				(w)->login.greeting : (w)->login.unsecure_greet)
-# define GREET_X(w)	((int)((w->core.width - \
+#define GREET_X(w)	((int)((w->core.width - \
 			     	STRING_WIDTH (greet, GREETING(w))) / 2))
-# define GREET_Y(w)	(GREETING(w)[0] ? 2 * GREET_Y_INC (w) : 0)
+#define GREET_Y(w)	(GREETING(w)[0] ? 2 * GREET_Y_INC (w) : 0)
 #ifndef XPM
 # define GREET_W(w)	(max (STRING_WIDTH (greet, w->login.greeting), \
 			      STRING_WIDTH (greet, w->login.unsecure_greet)))
@@ -320,18 +320,18 @@ XmuXftTextWidth(Display *dpy, XftFont *font, FcChar8 *string, int len);
 			      STRING_WIDTH (greet, w->login.unsecure_greet)) \
 			 + w->login.logoWidth + (2*w->login.logoPadding))
 #endif /* XPM */
-# define PROMPT_X(w)	(2 * PROMPT_X_INC(w))
-# define PROMPT_Y(w,n)	((GREET_Y(w) + GREET_Y_INC(w) +\
+#define PROMPT_X(w)	(2 * PROMPT_X_INC(w))
+#define PROMPT_Y(w,n)	((GREET_Y(w) + GREET_Y_INC(w) +\
 			  F_ASCENT(greet) + Y_INC(w)) + \
 			 (n * PROMPT_SPACE_Y(w)))
-# define PROMPT_W(w)	(w->core.width - (2 * TEXT_X_INC(w)))
-# define PROMPT_H(w)	(3 * Y_INC(w) / 2)
-# define VALUE_X(w,n)	(PROMPT_X(w) + CUR_PROMPT_W(w,n))
-# define PROMPT_SPACE_Y(w)	(10 * Y_INC(w) / 5)
+#define PROMPT_W(w)	(w->core.width - (2 * TEXT_X_INC(w)))
+#define PROMPT_H(w)	(3 * Y_INC(w) / 2)
+#define VALUE_X(w,n)	(PROMPT_X(w) + CUR_PROMPT_W(w,n))
+#define PROMPT_SPACE_Y(w)	(10 * Y_INC(w) / 5)
 
-# define ERROR_X(w,m)	((int)(w->core.width - STRING_WIDTH (fail, m)) / 2)
-# define FAIL_X(w)	ERROR_X(w, w->login.fail)
-# define FAIL_Y(w)	(PROMPT_Y(w,1) + 2 * FAIL_Y_INC (w) + F_ASCENT(fail))
+#define ERROR_X(w,m)	((int)(w->core.width - STRING_WIDTH (fail, m)) / 2)
+#define FAIL_X(w)	ERROR_X(w, w->login.fail)
+#define FAIL_Y(w)	(PROMPT_Y(w,1) + 2 * FAIL_Y_INC (w) + F_ASCENT(fail))
 
 #ifndef XPM
 # define ERROR_W(w,m)	STRING_WIDTH (fail, m)
@@ -340,14 +340,14 @@ XmuXftTextWidth(Display *dpy, XftFont *font, FcChar8 *string, int len);
 			 + w->login.logoWidth + (2*w->login.logoPadding))
 #endif /* XPM */
 
-# define FAIL_W(w)	max(ERROR_W(w, w->login.failMsg), \
+#define FAIL_W(w)	max(ERROR_W(w, w->login.failMsg), \
 			    ERROR_W(w, w->login.passwdChangeMsg))
 
-# define PAD_X(w)	(2 * (PROMPT_X(w) + max (GREET_X_INC(w), FAIL_X_INC(w))))
+#define PAD_X(w)	(2 * (PROMPT_X(w) + max (GREET_X_INC(w), FAIL_X_INC(w))))
 
-# define PAD_Y(w)	(max (max (Y_INC(w), GREET_Y_INC(w)),\
+#define PAD_Y(w)	(max (max (Y_INC(w), GREET_Y_INC(w)),\
 			     FAIL_Y_INC(w)))
-	
+
 #ifndef max
 static inline int max (int a, int b) { return a > b ? a : b; }
 #endif
@@ -388,7 +388,7 @@ realizeValue (LoginWidget w, int cursor, int promptNum, GC gc)
 	int textwidth;
 	int offset = max(cursor, VALUE_SHOW_START(w, promptNum));
 	int textlen = strlen (text + offset);
-	
+
 	textwidth = TEXT_WIDTH (text, text + offset, textlen);
 
 	if (textwidth > (width - curoff)) {
@@ -403,7 +403,7 @@ realizeValue (LoginWidget w, int cursor, int promptNum, GC gc)
 		}
 		textlen--;
 		textwidth = TEXT_WIDTH (text, text + offset, textlen);
-	    } 
+	    }
 
 	    VALUE_SHOW_START(w, promptNum) = offset;
 	    VALUE_SHOW_END(w, promptNum) = offset + textlen;
@@ -445,7 +445,7 @@ realizeCursor (LoginWidget w, GC gc)
     if (w->login.state != PROMPTING) {
 	return;
     }
-    
+
     x = VALUE_X (w, w->login.activePrompt);
     y = PROMPT_Y (w, w->login.activePrompt);
     height = (F_ASCENT(text) + F_DESCENT(text));
@@ -470,7 +470,7 @@ realizeCursor (LoginWidget w, GC gc)
 	x += PROMPT_CURSOR(w, w->login.activePrompt);
 	break;
     }
-    
+
     XFillRectangle (XtDisplay (w), XtWindow (w), gc,
 		    x, y+1 - F_ASCENT(text), width, height-1);
     XDrawPoint     (XtDisplay (w), XtWindow (w), gc,
@@ -490,23 +490,23 @@ realizeCursor (LoginWidget w, GC gc)
     XDrawPoint     (XtDisplay (w), XtWindow (w), gc,
     		    x+2 , y - F_ASCENT(text)+height);
 
-    XFlush (XtDisplay(w));    
+    XFlush (XtDisplay(w));
 }
 
 static void
 EraseFail (LoginWidget w)
 {
-#ifdef USE_XFT 
+#ifdef USE_XFT
     w->login.failUp = 0;
     RedrawFail(w);
-#else    
+#else
     XSetForeground (XtDisplay (w), w->login.failGC,
 			w->core.background_pixel);
     RedrawFail(w);
     w->login.failUp = 0;
     XSetForeground (XtDisplay (w), w->login.failGC,
 			TEXT_COLOR(fail));
-#endif    
+#endif
 }
 
 static void
@@ -558,9 +558,9 @@ RedrawFail (LoginWidget w)
     int y = FAIL_Y(w);
     int maxw = w->core.width - PAD_X(w);
 
-#ifndef USE_XFT    
+#ifndef USE_XFT
     if (w->login.failUp)
-#endif	
+#endif
     {
 	Debug("RedrawFail('%s', %d)\n", w->login.fail, w->login.failUp);
 	if (ERROR_W(w, w->login.fail) > maxw) {
@@ -571,7 +571,7 @@ RedrawFail (LoginWidget w)
 		char lastspace = ' ';
 
 		y = PROMPT_Y(w,LAST_PROMPT) + (2 * PROMPT_Y_INC(w));
-		
+
 		for (start = next = tempCopy; start != NULL ; start = next) {
 		    /* search for longest string broken by whitespace that
 		       will fit on a single line */
@@ -591,14 +591,14 @@ RedrawFail (LoginWidget w)
 			    next = NULL;
 			}
 		    } while ((next != NULL) && ERROR_W(w, start) < maxw);
-		    
+
 		    x = ERROR_X(w, start);
 #ifdef USE_XFT
 		    if (w->login.failUp == 0) {
 			XClearArea(XtDisplay(w), XtWindow(w), x, y,
 				   ERROR_W(w, start), FAIL_Y_INC(w), False);
 		    } else
-#endif		    
+#endif
 			DRAW_STRING (fail, x, y, start, strlen(start));
 
 		    if (next != NULL) {
@@ -619,7 +619,7 @@ RedrawFail (LoginWidget w)
 	    XClearArea(XtDisplay(w), XtWindow(w), x, y,
 		       ERROR_W(w, w->login.fail), FAIL_Y_INC(w), False);
 	} else
-#endif		    
+#endif
 	    DRAW_STRING (fail, x, y, w->login.fail, strlen (w->login.fail));
     }
 }
@@ -683,7 +683,7 @@ draw_it (LoginWidget w)
       XDrawLine(XtDisplay (w), XtWindow (w), w->login.shdGC,
     		i-1,w->core.height-i,w->core.width-i,w->core.height-i);
     }
-    
+
     /* make separator line */
     gr_line_x = w->login.outframewidth;
     gr_line_y = GREET_Y(w) + GREET_Y_INC(w);
@@ -709,16 +709,16 @@ draw_it (LoginWidget w)
 	int in_frame_x = VALUE_X(w,p) - w->login.inframeswidth - 3;
 	int in_frame_y
 	    = PROMPT_Y(w,p) - w->login.inframeswidth - 1 - TEXT_Y_INC(w);
- 
+
 	int in_width = PROMPT_W(w) - VALUE_X(w,p);
 	int in_height = PROMPT_H(w) + w->login.inframeswidth + 2;
-	
+
 	GC topLeftGC, botRightGC;
 
-#ifdef XPM	
+#ifdef XPM
 	in_width -= (w->login.logoWidth + 2*(w->login.logoPadding));
 #endif /* XPM */
-	
+
 	if ((PROMPT_STATE(w, p) == LOGIN_PROMPT_ECHO_ON) ||
 	    (PROMPT_STATE(w, p) == LOGIN_PROMPT_ECHO_OFF)) {
 	    topLeftGC = w->login.shdGC;
@@ -732,16 +732,16 @@ draw_it (LoginWidget w)
 	    /* Make top/left sides */
 	    XDrawLine(XtDisplay (w), XtWindow (w), topLeftGC,
 		      in_frame_x + i-1,         in_frame_y + i-1,
-		      in_frame_x + in_width-i,  in_frame_y + i-1); 
+		      in_frame_x + in_width-i,  in_frame_y + i-1);
 
 	    XDrawLine(XtDisplay (w), XtWindow (w), topLeftGC,
 		      in_frame_x + i-1,         in_frame_y + i-1,
-		      in_frame_x + i-1,         in_frame_y + in_height-i); 
+		      in_frame_x + i-1,         in_frame_y + in_height-i);
 
 	    /* Make bottom/right sides */
 	    XDrawLine(XtDisplay (w), XtWindow (w), botRightGC,
 		      in_frame_x + in_width-i,  in_frame_y + i-1,
-		      in_frame_x + in_width-i,  in_frame_y + in_height-i); 
+		      in_frame_x + in_width-i,  in_frame_y + in_height-i);
 
 	    XDrawLine(XtDisplay (w), XtWindow (w), botRightGC,
 		      in_frame_x + i-1,         in_frame_y + in_height-i,
@@ -754,7 +754,7 @@ draw_it (LoginWidget w)
 
 #ifdef XPM
 	gx -= ((w->login.logoWidth/2) + w->login.logoPadding);
-#endif	
+#endif
 	DRAW_STRING (greet, gx, GREET_Y(w), GREETING(w), strlen (GREETING(w)));
     }
     for (p = 0; p < NUM_PROMPTS ; p++) {
@@ -795,12 +795,12 @@ SetPrompt (Widget ctx, int promptNum, const char *message,
 	"LOGIN_PROMPT_NOT_SHOWN", "LOGIN_PROMPT_ECHO_ON",
 	"LOGIN_PROMPT_ECHO_OFF", "LOGIN_TEXT_INFO" };
     loginPromptState priorState;
-    
+
     Debug("SetPrompt(%d, %s, %s(%d))\n", promptNum,
 	  message ? message : "<NULL>", stateNames[state], state);
 
     XDM_ASSERT(promptNum >= 0 && promptNum <= LAST_PROMPT);
-    
+
     if (PROMPT_TEXT(w, promptNum) != NULL) {
 	XtFree(PROMPT_TEXT(w, promptNum));
 	PROMPT_TEXT(w, promptNum) = NULL;
@@ -818,18 +818,18 @@ SetPrompt (Widget ctx, int promptNum, const char *message,
     }
 
     messageLen = strlen(message);
-    
+
     prompt = XtMalloc(messageLen + 3);
     if (prompt == NULL) {
 	LogOutOfMem ("SetPrompt");
 	return -1;
     }
-    
+
     strncpy(prompt, message, messageLen);
-    
+
     /* Make sure text prompts have at least two spaces at end */
     e = messageLen;
-	    
+
     if (!isspace(message[messageLen - 2])) {
 	prompt[e] = ' ';
 	e++;
@@ -845,11 +845,11 @@ SetPrompt (Widget ctx, int promptNum, const char *message,
     if (w->login.state == INITIALIZING) {
 	return 0;
     }
-    
+
     if ((priorState == LOGIN_TEXT_INFO) && (w->login.msgTimeout != 0)) {
 	time_t now = time(NULL);
 	int timeleft = w->login.msgTimeout - now;
-	
+
 	if (timeleft > 0) {
 	    sleep(timeleft);
 	}
@@ -866,7 +866,7 @@ SetPrompt (Widget ctx, int promptNum, const char *message,
 	w->login.activePrompt = promptNum;
 	w->login.state = PROMPTING;
     }
-    
+
     PROMPT_CURSOR(w, promptNum) = 0;
     XClearArea (XtDisplay(w), XtWindow(w), 0, 0, 0, 0, FALSE);
     draw_it(w);
@@ -880,7 +880,7 @@ GetPrompt(Widget ctx, int promptNum)
     LoginWidget	w = (LoginWidget) ctx;
 
     XDM_ASSERT(promptNum >= 0 && promptNum <= LAST_PROMPT);
-    
+
     return CUR_PROMPT_TEXT(w,promptNum);
 }
 
@@ -891,12 +891,12 @@ SetValue(Widget ctx, int promptNum, char *value)
     LoginWidget	w = (LoginWidget) ctx;
 
     XDM_ASSERT(promptNum >= 0 && promptNum <= LAST_PROMPT);
-    
+
     if ((promptNum < 0) || (promptNum > LAST_PROMPT))
 	return -1;
 
     XDM_ASSERT(VALUE_TEXT(w, promptNum) != NULL);
-    
+
     if (VALUE_TEXT(w, promptNum) == NULL)
 	return -1;
 
@@ -910,7 +910,7 @@ SetValue(Widget ctx, int promptNum, char *value)
     VALUE_SHOW_START(w, promptNum) = 0;
     VALUE_SHOW_END(w, promptNum) = 0;
     PROMPT_CURSOR(w, promptNum) = 0;
-    
+
     return 0;
 }
 
@@ -921,7 +921,7 @@ GetValue(Widget ctx, int promptNum)
     LoginWidget	w = (LoginWidget) ctx;
 
     XDM_ASSERT(promptNum >= 0 && promptNum <= LAST_PROMPT);
-    
+
     if ((promptNum < 0) || (promptNum > LAST_PROMPT))
 	return NULL;
 
@@ -937,7 +937,7 @@ realizeDeleteChar (LoginWidget ctx)
     if (ctx->login.state == PROMPTING) {
 	int promptNum = ctx->login.activePrompt;
 	int redrawFrom = PROMPT_CURSOR(ctx, promptNum);
-	
+
 	if (PROMPT_CURSOR(ctx,promptNum) <  (int)strlen(VALUE_TEXT(ctx,promptNum))) {
 	    if (redrawFrom < VALUE_SHOW_START(ctx, ctx->login.activePrompt)) {
 		redrawFrom = 0;
@@ -971,7 +971,7 @@ DeleteBackwardChar (Widget ctxw, XEvent *event, String *params, Cardinal *num_pa
 	CUR_PROMPT_CURSOR(ctx) -= 1;
 	realizeDeleteChar(ctx);
     }
-    XorCursor (ctx);	
+    XorCursor (ctx);
 }
 
 /*ARGSUSED*/
@@ -988,7 +988,7 @@ DeleteForwardChar (Widget ctxw, XEvent *event, String *params, Cardinal *num_par
 
     XorCursor (ctx);
     realizeDeleteChar(ctx);
-    XorCursor (ctx);	
+    XorCursor (ctx);
 }
 
 /*ARGSUSED*/
@@ -1194,7 +1194,7 @@ TabField(Widget ctxw, XEvent *event, String *params, Cardinal *num_params)
 	if (nextPrompt > LAST_PROMPT) {
 	    nextPrompt = 0;
 	}
-    
+
 	if ((PROMPT_STATE(ctx, nextPrompt) == LOGIN_PROMPT_ECHO_ON) ||
 	    (PROMPT_STATE(ctx, nextPrompt) == LOGIN_PROMPT_ECHO_OFF)) {
 	    ctx->login.activePrompt = nextPrompt;
@@ -1412,7 +1412,7 @@ InsertChar (
 	    break;
     }
 
-    if (ctx->login.state == PROMPTING) {	
+    if (ctx->login.state == PROMPTING) {
 	if ((len + (int)strlen(VALUE_TEXT(ctx, promptNum)) >=
 	     (VALUE_TEXT_MAX(ctx,promptNum) - 1))) {
 	    len = VALUE_TEXT_MAX(ctx,promptNum) -
@@ -1447,7 +1447,7 @@ static XtConvertArgRec xftColorConvertArgs[] = {
      sizeof(Colormap)}
 };
 
-#define	donestr(type, value, tstr) \
+# define	donestr(type, value, tstr) \
 	{							\
 	    if (toVal->addr != NULL) {				\
 		if (toVal->size < sizeof(type)) {		\
@@ -1474,7 +1474,7 @@ XmuFreeXftColor (XtAppContext app, XrmValuePtr toVal, XtPointer closure,
     Screen	*screen;
     Colormap	colormap;
     XftColor	*color;
-    
+
     if (*num_args != 2)
     {
 	XtAppErrorMsg (app,
@@ -1493,7 +1493,7 @@ XmuFreeXftColor (XtAppContext app, XrmValuePtr toVal, XtPointer closure,
 				 XScreenNumberOfScreen (screen)),
 		  colormap, color);
 }
-    
+
 static Boolean
 XmuCvtStringToXftColor(Display *dpy,
 		       XrmValue *args, Cardinal *num_args,
@@ -1505,7 +1505,7 @@ XmuCvtStringToXftColor(Display *dpy,
     XftColor	    xftColor;
     Screen	    *screen;
     Colormap	    colormap;
-    
+
     if (*num_args != 2)
     {
 	XtAppErrorMsg (XtDisplayToApplicationContext (dpy),
@@ -1536,14 +1536,14 @@ XmuCvtStringToXftColor(Display *dpy,
     }
     else if (!XRenderParseColor (dpy, spec, &renderColor))
 	return False;
-    if (!XftColorAllocValue (dpy, 
+    if (!XftColorAllocValue (dpy,
 			     DefaultVisual (dpy,
 					    XScreenNumberOfScreen (screen)),
 			     colormap,
 			     &renderColor,
 			     &xftColor))
 	return False;
-    
+
     donestr (XftColor, xftColor, XtRXftColor);
 }
 
@@ -1553,7 +1553,7 @@ XmuFreeXftFont (XtAppContext app, XrmValuePtr toVal, XtPointer closure,
 {
     Screen  *screen;
     XftFont *font;
-    
+
     if (*num_args != 1)
     {
 	XtAppErrorMsg (app,
@@ -1579,7 +1579,7 @@ XmuCvtStringToXftFont(Display *dpy,
     char    *name;
     XftFont *font;
     Screen  *screen;
-    
+
     if (*num_args != 1)
     {
 	XtAppErrorMsg (XtDisplayToApplicationContext (dpy),
@@ -1592,7 +1592,7 @@ XmuCvtStringToXftFont(Display *dpy,
 
     screen = *((Screen **) args[0].addr);
     name = (char *) fromVal->addr;
-    
+
     font = XftFontOpenName (dpy,
 			    XScreenNumberOfScreen (screen),
 			    name);
@@ -1622,12 +1622,12 @@ XmuXftTextWidth(Display *dpy, XftFont *font, FcChar8 *string, int len)
 
 #endif /* USE_XFT */
 
-static void 
+static void
 ClassInitialize(void)
 {
 #ifdef USE_XFT
-    XtSetTypeConverter (XtRString, XtRXftColor, 
-			XmuCvtStringToXftColor, 
+    XtSetTypeConverter (XtRString, XtRXftColor,
+			XmuCvtStringToXftColor,
 			xftColorConvertArgs, XtNumber(xftColorConvertArgs),
 			XtCacheByDisplay, XmuFreeXftColor);
     XtSetTypeConverter (XtRString, XtRXftFont,
@@ -1655,7 +1655,7 @@ static void Initialize (
     int                 s_num;
 #endif
     int 	rv = 0;
-    
+
     myXGCV.foreground = w->login.hipixel;
     myXGCV.background = w->core.background_pixel;
     valuemask = GCForeground | GCBackground;
@@ -1674,7 +1674,7 @@ static void Initialize (
 	myXGCV.font = w->login.textFont->fid;
 	valuemask |= GCFont;
     }
-#endif    
+#endif
     w->login.textGC = XtGetGC(gnew, valuemask, &myXGCV);
     myXGCV.foreground = w->core.background_pixel;
     w->login.bgGC = XtGetGC(gnew, valuemask, &myXGCV);
@@ -1751,7 +1751,7 @@ static void Initialize (
 	     &(w->login.logoPixmap),			/* pixmap */
 	     &(w->login.logoMask),			/* pixmap mask */
 	     &myAttributes);				/* XPM attributes */
-       
+
 	if ( rv < 0 )
 	{
 	    LogError("Cannot load xpm file %s: %s.\n", w->login.logoFileName,
@@ -1793,7 +1793,7 @@ SkipXpmLoad:
     VALUE_TEXT(w, LOGIN_PROMPT_USERNAME) 	= w->login.data.name;
     VALUE_TEXT_MAX(w, LOGIN_PROMPT_USERNAME)	= sizeof(w->login.data.name);
     VALUE_SHOW_START(w, LOGIN_PROMPT_USERNAME)	= 0;
-    
+
     PROMPT_TEXT(w, LOGIN_PROMPT_PASSWORD) 	= NULL;
     DEF_PROMPT_TEXT(w, LOGIN_PROMPT_PASSWORD) 	= w->login.passwdPrompt;
     VALUE_TEXT(w, LOGIN_PROMPT_PASSWORD) 	= w->login.data.passwd;
@@ -1802,7 +1802,7 @@ SkipXpmLoad:
 
     SetPrompt(gnew, LOGIN_PROMPT_PASSWORD, NULL, LOGIN_PROMPT_ECHO_OFF, False);
     SetPrompt(gnew, LOGIN_PROMPT_USERNAME, NULL, LOGIN_PROMPT_ECHO_ON, False);
-    
+
     if (w->core.width == 0)
 	w->core.width = max (GREET_W(w), FAIL_W(w)) + PAD_X(w);
     if (w->core.height == 0) {
@@ -1816,7 +1816,7 @@ SkipXpmLoad:
 
         w->core.height = max(fy + pady,
             (w->login.logoHeight + (2*w->login.logoPadding)) + pady);
-        
+
 #endif /* XPM */
     }
 #ifdef USE_XINERAMA
@@ -1829,7 +1829,7 @@ SkipXpmLoad:
 	    x = screens[0].x_org + (int)(screens[0].width - w->core.width) / 2;
 	if ((y = w->core.y) == -1)
 	    y = screens[0].y_org + (int)(screens[0].height - w->core.height) / 3;
-	
+
 	XFree(screens);
     }
     else
@@ -1847,7 +1847,7 @@ SkipXpmLoad:
     w->login.state = PROMPTING;
 }
 
- 
+
 static void Realize (
      Widget gw,
      XtValueMask *valueMask,
@@ -1871,13 +1871,13 @@ static void Realize (
     XDefineCursor(XtDisplay(gw), DefaultRootWindow(XtDisplay(gw)), cursor);
 
 #ifdef XPM
-    /* 
+    /*
      * Check if Pixmap was valid
      */
     if (True == w->login.logoValid)
     {
         /*
-         * Create pixmap window 
+         * Create pixmap window
          */
         {
             unsigned long valueMask = CWBackPixel | CWBackPixmap;
@@ -1934,8 +1934,8 @@ static void Destroy (Widget gw)
 	XftDrawDestroy(w->login.draw);
 	w->login.draw = NULL;
     }
-#endif    
-    
+#endif
+
     XtReleaseGC(gw, w->login.textGC);
     XtReleaseGC(gw, w->login.bgGC);
     XtReleaseGC(gw, w->login.xorGC);
@@ -1977,7 +1977,7 @@ static Boolean SetValues (
     Cardinal *num_args)
 {
     LoginWidget currentL, newL;
-    
+
     currentL = (LoginWidget) current;
     newL = (LoginWidget) new;
     if (GREETING (currentL) != GREETING (newL))
diff --git a/greeter/Login.h b/greeter/Login.h
index c6f9341..7d04a1a 100644
--- a/greeter/Login.h
+++ b/greeter/Login.h
@@ -60,7 +60,7 @@ from The Open Group.
 
 
 #ifndef _XtLogin_h
-#define _XtLogin_h
+# define _XtLogin_h
 
 /***********************************************************************
  *
@@ -119,21 +119,21 @@ from The Open Group.
 # define XtNinnerFramesWidth	"innerFramesWidth"
 # define XtNsepWidth		"sepWidth"
 
-#ifdef DANCING
+# ifdef DANCING
 /* caolan begin */
-#define XtNlastEventTime "lastEventTime"
-#define XtCLastEventTime "LastEventTime"
+#  define XtNlastEventTime	"lastEventTime"
+#  define XtCLastEventTime	"LastEventTime"
 /* caolan end */
-#endif /* DANCING */
+# endif /* DANCING */
 
-#ifdef XPM
-#define XtNuseShape "useShape"
-#define XtCUseShape "UseShape"
-#define XtNlogoFileName "logoFileName"
-#define XtCLogoFileName "LogoFileName"
-#define XtNlogoPadding "logoPadding"
-#define XtCLogoPadding "LogoPadding"
-#endif /* XPM */
+# ifdef XPM
+#  define XtNuseShape		"useShape"
+#  define XtCUseShape		"UseShape"
+#  define XtNlogoFileName	"logoFileName"
+#  define XtCLogoFileName	"LogoFileName"
+#  define XtNlogoPadding	"logoPadding"
+#  define XtCLogoPadding	"LogoPadding"
+# endif /* XPM */
 
 # define XtCGreeting		"Greeting"
 # define XtCNamePrompt		"NamePrompt"
@@ -151,43 +151,43 @@ from The Open Group.
 
 /* notifyDone interface definition */
 
-#ifdef __OpenBSD__
-# include <sys/param.h>
-#endif
+# ifdef __OpenBSD__
+#  include <sys/param.h>
+# endif
 
-#include <pwd.h>
-#include <limits.h>
+# include <pwd.h>
+# include <limits.h>
 
-#ifdef USE_PAM
-# define NAME_LEN	PAM_MAX_RESP_SIZE
-# define PASSWORD_LEN	PAM_MAX_RESP_SIZE
-#endif
+# ifdef USE_PAM
+#  define NAME_LEN	PAM_MAX_RESP_SIZE
+#  define PASSWORD_LEN	PAM_MAX_RESP_SIZE
+# endif
 
 /* Defined to be in <limits.h> by SUSv2 */
-#if !defined(PASSWORD_LEN) && defined(PASS_MAX)
-# define PASSWORD_LEN PASS_MAX
-#endif
+# if !defined(PASSWORD_LEN) && defined(PASS_MAX)
+#  define PASSWORD_LEN PASS_MAX
+# endif
 
 /* _PW_NAME_LEN is found in <pwd.h> on OpenBSD > 2.8 (200012) */
-#if !defined(NAME_LEN) && defined(_PW_NAME_LEN)
-# define NAME_LEN	(_PW_NAME_LEN + 2)
-#endif
+# if !defined(NAME_LEN) && defined(_PW_NAME_LEN)
+#  define NAME_LEN	(_PW_NAME_LEN + 2)
+# endif
 
 /* _PASSWORD_LEN appears to come from 4.4BSD-Lite <pwd.h> */
-#if !defined(PASSWORD_LEN) && defined(_PASSWORD_LEN)
-# define PASSWORD_LEN	(_PASSWORD_LEN + 2)
-#endif
+# if !defined(PASSWORD_LEN) && defined(_PASSWORD_LEN)
+#  define PASSWORD_LEN	(_PASSWORD_LEN + 2)
+# endif
 
 /* Fallbacks if no other definition found */
-#ifndef NAME_LEN
-# define NAME_LEN	32
-#endif
+# ifndef NAME_LEN
+#  define NAME_LEN	32
+# endif
 
-#ifndef PASSWORD_LEN
-# define PASSWORD_LEN	32
-#endif
+# ifndef PASSWORD_LEN
+#  define PASSWORD_LEN	32
+# endif
 
-typedef struct _LoginData { 
+typedef struct _LoginData {
 	char	name[NAME_LEN], passwd[PASSWORD_LEN];
 } LoginData;
 
@@ -213,8 +213,8 @@ typedef enum {
 } loginPromptState;
 
 /* Default prompt meanings for simple username/password auth systems */
-#define LOGIN_PROMPT_USERNAME 0
-#define LOGIN_PROMPT_PASSWORD 1
+# define LOGIN_PROMPT_USERNAME 0
+# define LOGIN_PROMPT_PASSWORD 1
 
 extern int SetPrompt(Widget ctx, int promptId, const char *message,
 		     loginPromptState state, Boolean minimumTime);
diff --git a/greeter/LoginP.h b/greeter/LoginP.h
index ba9c997..d73a9a1 100644
--- a/greeter/LoginP.h
+++ b/greeter/LoginP.h
@@ -59,20 +59,20 @@ from The Open Group.
  */
 
 #ifndef _LoginP_h
-#define _LoginP_h
+# define _LoginP_h
 
-#include "Login.h"
-#include <X11/IntrinsicP.h>
-#include <X11/CoreP.h>
-#include <X11/Xlib.h>
-#ifdef USE_XFT
-# include <X11/Xft/Xft.h>
-#endif
+# include "Login.h"
+# include <X11/IntrinsicP.h>
+# include <X11/CoreP.h>
+# include <X11/Xlib.h>
+# ifdef USE_XFT
+#  include <X11/Xft/Xft.h>
+# endif
 
-#define INITIALIZING	0
-#define PROMPTING	1
-#define SHOW_MESSAGE	2
-#define DONE		3
+# define INITIALIZING	0
+# define PROMPTING	1
+# define SHOW_MESSAGE	2
+# define DONE		3
 
 typedef void (*LoginFunc)(LoginWidget, LoginData *, int);
 
@@ -83,31 +83,31 @@ typedef struct {
    	size_t		valueTextMax;	/* Size of valueText buffer */
     	int		valueShownStart;/* Amount of string shown if too */
     	int		valueShownEnd;	/*  long to fit in field */
-	int		cursor;		/* current cursor position */	
+	int		cursor;		/* current cursor position */
 	loginPromptState state;
 } loginPromptData;
 
-#define NUM_PROMPTS	2	/* Currently only 2 prompt fields supported */
-#define LAST_PROMPT	(NUM_PROMPTS - 1)
+# define NUM_PROMPTS	2	/* Currently only 2 prompt fields supported */
+# define LAST_PROMPT	(NUM_PROMPTS - 1)
 
 /* New fields for the login widget instance record */
 typedef struct {
-#ifndef USE_XFT    
+# ifndef USE_XFT
 	Pixel		textpixel;	/* foreground pixel */
 	Pixel		promptpixel;	/* prompt pixel */
 	Pixel		greetpixel;	/* greeting pixel */
 	Pixel		failpixel;	/* failure pixel */
-#endif
+# endif
 	Pixel		hipixel;	/* frame hilite pixel */
 	Pixel		shdpixel;	/* shadow frame pixel */
 	GC		textGC;		/* pointer to GraphicsContext */
 	GC		bgGC;		/* pointer to GraphicsContext */
 	GC		xorGC;		/* pointer to GraphicsContext */
-#ifndef USE_XFT
+# ifndef USE_XFT
 	GC		promptGC;
 	GC		greetGC;
 	GC		failGC;
-#endif
+# endif
 	GC		hiGC;		/* for hilight part of frame */
 	GC		shdGC;		/* for shaded part of frame */
 	char		*greeting;	/* greeting */
@@ -117,12 +117,12 @@ typedef struct {
     	char		*failMsg;	/* failure message */
 	char		*fail;		/* current error message */
     	char		*passwdChangeMsg; /* message when passwd expires */
-#ifndef USE_XFT    
+# ifndef USE_XFT
 	XFontStruct	*textFont;	/* font for text */
 	XFontStruct	*promptFont;	/* font for prompts */
 	XFontStruct	*greetFont;	/* font for greeting */
 	XFontStruct	*failFont;	/* font for failure message */
-#endif /* USE_XFT */
+# endif /* USE_XFT */
 	int		state;		/* state */
     	int		activePrompt;	/* which prompt is active */
 	int		failUp;		/* failure message displayed */
@@ -139,35 +139,35 @@ typedef struct {
 	loginPromptData	prompts[NUM_PROMPTS];
     	time_t 		msgTimeout;
 
-#ifdef DANCING
+# ifdef DANCING
 	/*caolan begin*/
 	int 		lastEventTime;
 	/*caolan end*/
-#endif /* DANCING */
-    
+# endif /* DANCING */
+
 	int		outframewidth;	/* outer frame thickness */
 	int		inframeswidth;	/* inner frames thickness */
 	int		sepwidth;	/* width of separator line */
 
-#ifdef XPM    
+# ifdef XPM
         char *logoFileName;
         unsigned int logoWidth, logoHeight, logoPadding, logoBorderWidth;
         int logoX, logoY;
         Window logoWindow;
         Boolean useShape, logoValid;
         Pixmap logoPixmap, logoMask;
-#endif /* XPM */
-#ifdef USE_XFT
+# endif /* XPM */
+# ifdef USE_XFT
 	XftDraw	       *draw;
 	XftFont        *textFace;	/* font for text */
 	XftFont        *promptFace;	/* font for prompts */
 	XftFont        *greetFace;	/* font for greeting */
-	XftFont        *failFace;  	/* font for failure message */  
+	XftFont        *failFace;  	/* font for failure message */
 	XftColor	textcolor;	/* foreground color */
 	XftColor	promptcolor;	/* prompt color */
 	XftColor	greetcolor;	/* greeting color */
 	XftColor	failcolor;	/* failure color */
-#endif
+# endif
    } LoginPart;
 
 /* Full instance record declaration */
diff --git a/greeter/greet.c b/greeter/greet.c
index 9e2dee5..a34ebf7 100644
--- a/greeter/greet.c
+++ b/greeter/greet.c
@@ -72,7 +72,7 @@ from The Open Group.
 #include <X11/XKBlib.h>
 
 #ifdef USE_XINERAMA
-#include <X11/extensions/Xinerama.h>
+# include <X11/extensions/Xinerama.h>
 #endif
 
 #include "dm.h"
@@ -81,14 +81,14 @@ from The Open Group.
 #include "Login.h"
 
 #if defined(HAVE_OPENLOG) && defined(HAVE_SYSLOG_H)
-#define USE_SYSLOG
-#include <syslog.h>
-#ifndef LOG_AUTHPRIV
-#define LOG_AUTHPRIV LOG_AUTH
-#endif
-#ifndef LOG_PID
-#define LOG_PID 0
-#endif
+# define USE_SYSLOG
+# include <syslog.h>
+# ifndef LOG_AUTHPRIV
+#  define LOG_AUTHPRIV LOG_AUTH
+# endif
+# ifndef LOG_PID
+#  define LOG_PID 0
+# endif
 #endif
 
 #include <string.h>
@@ -125,30 +125,30 @@ void    (*__xdm_LogOutOfMem)(char * fmt, ...) = NULL;
 void    (*__xdm_setgrent)(void) = NULL;
 struct group    *(*__xdm_getgrent)(void) = NULL;
 void    (*__xdm_endgrent)(void) = NULL;
-#ifdef USESHADOW
+# ifdef USESHADOW
 struct spwd   *(*__xdm_getspnam)(GETSPNAM_ARGS) = NULL;
-# ifndef QNX4
+#  ifndef QNX4
 void   (*__xdm_endspent)(void) = NULL;
-# endif /* QNX4 doesn't use endspent */
-#endif
+#  endif /* QNX4 doesn't use endspent */
+# endif
 struct passwd   *(*__xdm_getpwnam)(GETPWNAM_ARGS) = NULL;
-#if defined(linux) || defined(__GLIBC__)
+# if defined(linux) || defined(__GLIBC__)
 void   (*__xdm_endpwent)(void) = NULL;
-#endif
+# endif
 char     *(*__xdm_crypt)(CRYPT_ARGS) = NULL;
-#ifdef USE_PAM
+# ifdef USE_PAM
 pam_handle_t **(*__xdm_thepamhp)(void) = NULL;
-#endif
+# endif
 
 #endif
 
 #ifdef SECURE_RPC
-#include <rpc/rpc.h>
-#include <rpc/key_prot.h>
+# include <rpc/rpc.h>
+# include <rpc/key_prot.h>
 #endif
 
 #ifdef K5AUTH
-#include <krb5/krb5.h>
+# include <krb5/krb5.h>
 #endif
 
 extern Display	*dpy;
@@ -164,9 +164,9 @@ static XtIntervalId	pingTimeout;
 
 #ifdef USE_PAM
 static int pamconv(int num_msg,
-#ifndef sun
+# ifndef sun
 		   const
-#endif		   
+# endif
 		   struct pam_message **msg,
 		   struct pam_response **response, void *appdata_ptr);
 
@@ -384,7 +384,7 @@ Greet (struct display *d, struct greet_info *greet)
 #ifndef USE_PAM
 	char *ptr;
 	unsigned int c,state = WHITESPACE;
- 
+
 	/*
 	 * Process the name string to get rid of white spaces.
 	 */
@@ -462,20 +462,20 @@ greet_user_rtn GreetUser(
     __xdm_setgrent = dlfuncs->_setgrent;
     __xdm_getgrent = dlfuncs->_getgrent;
     __xdm_endgrent = dlfuncs->_endgrent;
-#ifdef USESHADOW
+# ifdef USESHADOW
     __xdm_getspnam = dlfuncs->_getspnam;
-# ifndef QNX4
+#  ifndef QNX4
     __xdm_endspent = dlfuncs->_endspent;
-# endif /* QNX4 doesn't use endspent */
-#endif
+#  endif /* QNX4 doesn't use endspent */
+# endif
     __xdm_getpwnam = dlfuncs->_getpwnam;
-#if defined(linux) || defined(__GLIBC__)
+# if defined(linux) || defined(__GLIBC__)
     __xdm_endpwent = dlfuncs->_endpwent;
-#endif
+# endif
     __xdm_crypt = dlfuncs->_crypt;
-#ifdef USE_PAM
+# ifdef USE_PAM
     __xdm_thepamhp = dlfuncs->_thepamhp;
-#endif
+# endif
 #endif
 
     *dpy = InitGreet (d);
@@ -510,16 +510,16 @@ greet_user_rtn GreetUser(
 	SetPrompt(login, 0, NULL, LOGIN_PROMPT_NOT_SHOWN, False);
 	login_prompt  = GetPrompt(login, LOGIN_PROMPT_USERNAME);
 	SetPrompt(login, 1, NULL, LOGIN_PROMPT_NOT_SHOWN, False);
-	
-#define RUN_AND_CHECK_PAM_ERROR(function, args)			\
+
+# define RUN_AND_CHECK_PAM_ERROR(function, args)			\
 	    do { 						\
 		pam_error = function args;			\
 		if (pam_error != PAM_SUCCESS) {			\
 		    PAM_ERROR_PRINT(#function, *pamhp);		\
 		    goto pam_done;				\
 		} 						\
-	    } while (0) 
-	    
+	    } while (0)
+
 
 	RUN_AND_CHECK_PAM_ERROR(pam_start,
 				("xdm", NULL, &pc, pamhp));
@@ -537,23 +537,23 @@ greet_user_rtn GreetUser(
 		LogOutOfMem("GreetUser");
 	    } else {
 		char *colon = strrchr(hostname, ':');
-		
+
 		if (colon != NULL)
 		    *colon = '\0';
-	    
+
 		RUN_AND_CHECK_PAM_ERROR(pam_set_item,
 					(*pamhp, PAM_RHOST, hostname));
 		free(hostname);
 	    }
 	} else
 	    RUN_AND_CHECK_PAM_ERROR(pam_set_item, (*pamhp, PAM_TTY, d->name));
- 
+
 	if (!greet->allow_null_passwd) {
 	    pam_flags |= PAM_DISALLOW_NULL_AUTHTOK;
 	}
 	RUN_AND_CHECK_PAM_ERROR(pam_authenticate,
 				(*pamhp, pam_flags));
-				
+
 	/* handle expired passwords */
 	pam_error = pam_acct_mgmt(*pamhp, pam_flags);
 	pam_fname = "pam_acct_mgmt";
@@ -569,7 +569,7 @@ greet_user_rtn GreetUser(
 	    PAM_ERROR_PRINT(pam_fname, *pamhp);
 	    goto pam_done;
 	}
-	
+
 	RUN_AND_CHECK_PAM_ERROR(pam_setcred,
 				(*pamhp, 0));
 	RUN_AND_CHECK_PAM_ERROR(pam_get_item,
@@ -579,7 +579,7 @@ greet_user_rtn GreetUser(
 	    greet->name = username;
 	    greet->password = NULL;
 	}
-	    
+
       pam_done:
 	if (code != 0)
 	{
@@ -639,7 +639,7 @@ greet_user_rtn GreetUser(
 	    XHostAddress	addr;
 	    char		netname[MAXNETNAMELEN+1];
 	    char		domainname[MAXNETNAMELEN+1];
-    
+
 	    getdomainname(domainname, sizeof domainname);
 	    user2netname (netname, verify->uid, domainname);
 	    addr.family = FamilyNetname;
@@ -663,7 +663,7 @@ greet_user_rtn GreetUser(
 	    d->authorizations[i] =
 		Krb5GetAuthFor(14, "MIT-KERBEROS-5", d->name);
 	    SaveServerAuthorizations (d, d->authorizations, d->authNum);
-	} 
+	}
 #endif
     }
 
@@ -673,9 +673,9 @@ greet_user_rtn GreetUser(
 
 #ifdef USE_PAM
 static int pamconv(int num_msg,
-#ifndef sun
+# ifndef sun
 		   const
-#endif		   
+# endif
 		   struct pam_message **msg,
 		   struct pam_response **response, void *appdata_ptr)
 {
@@ -686,14 +686,14 @@ static int pamconv(int num_msg,
 	= { "<invalid pam msg style>",
 	    "PAM_PROMPT_ECHO_OFF", "PAM_PROMPT_ECHO_ON",
 	    "PAM_ERROR_MSG", "PAM_TEXT_INFO" } ;
-    
+
     struct pam_message      *m;
     struct pam_response     *r;
 
     struct myconv_data	    *d = (struct myconv_data *) appdata_ptr;
 
     pam_handle_t	    **pamhp = thepamhp();
-    
+
     *response = calloc(num_msg, sizeof (struct pam_response));
     if (*response == NULL)
 	return (PAM_BUF_ERR);
@@ -712,8 +712,8 @@ static int pamconv(int num_msg,
 		      NULL, LOGIN_TEXT_INFO, False);
 	    SetValue(login, LOGIN_PROMPT_USERNAME, username);
 	    promptId = 1;
-	} 
-	
+	}
+
 	Debug("pam_msg: %s (%d): '%s'\n",
 	      ((m->msg_style > 0) && (m->msg_style <= 4)) ?
 	       pam_msg_styles[m->msg_style] : pam_msg_styles[0],
@@ -728,7 +728,7 @@ static int pamconv(int num_msg,
 	      SetPrompt (login, promptId, m->msg, LOGIN_TEXT_INFO, True);
 	      SetValue (login, promptId, NULL);
 	      break;
-	      
+
           case PAM_PROMPT_ECHO_ON:
 	      pStyle = LOGIN_PROMPT_ECHO_ON;
 	      /* FALLTHROUGH */
@@ -754,7 +754,7 @@ static int pamconv(int num_msg,
 	      LogError("Unknown PAM msg_style: %d\n", m->msg_style);
 	}
     }
-  pam_error:    
+  pam_error:
     if (status != PAM_SUCCESS) {
 	/* free responses */
 	r = *response;
diff --git a/greeter/verify.c b/greeter/verify.c
index f50341b..b4fb850 100644
--- a/greeter/verify.c
+++ b/greeter/verify.c
@@ -55,7 +55,7 @@ from The Open Group.
 # include       <prot.h>
 #endif
 
-# include	"greet.h"
+#include	"greet.h"
 
 #ifdef QNX4
 extern char *crypt(const char *, const char *);
@@ -81,12 +81,12 @@ static char *envvars[] = {
 };
 
 #ifdef KERBEROS
-#include <sys/param.h>
-#include <kerberosIV/krb.h>
+# include <sys/param.h>
+# include <kerberosIV/krb.h>
 /* OpenBSD 2.8 needs this. */
-#if defined(OpenBSD) && (OpenBSD <= 200012)
-#include <kerberosIV/kafs.h>
-#endif
+# if defined(OpenBSD) && (OpenBSD <= 200012)
+#  include <kerberosIV/kafs.h>
+# endif
 static char krbtkfile[MAXPATHLEN];
 #endif
 
@@ -175,7 +175,7 @@ Verify (struct display *d, struct greet_info *greet, struct verify_info *verify)
 
 	/* Build path of the auth script and call it */
 	snprintf(path, sizeof(path), _PATH_AUTHPROG "%s", style);
-	auth_call(as, path, style, "-s", "response", greet->name, 
+	auth_call(as, path, style, "-s", "response", greet->name,
 		  lc->lc_class, (void *)NULL);
 	authok = auth_getstate(as);
 
@@ -209,12 +209,12 @@ Verify (struct display *d, struct greet_info *greet, struct verify_info *verify)
 	}
 
 	/*
-	 * Shell must be in /etc/shells 
+	 * Shell must be in /etc/shells
 	 */
 	for (;;) {
 		s = getusershell();
 		if (s == NULL) {
-			/* did not found the shell in /etc/shells 
+			/* did not found the shell in /etc/shells
 			   -> failure */
 			Debug("shell not in /etc/shells\n");
 			bzero(greet->password, strlen(greet->password));
@@ -226,7 +226,7 @@ Verify (struct display *d, struct greet_info *greet, struct verify_info *verify)
 			endusershell();
 			break;
 		}
-	} 
+	}
 #elif defined(USESECUREWARE) /* !USE_BSDAUTH */
 /*
  * This is a global variable and will be referenced in at least session.c
@@ -325,16 +325,16 @@ int
 Verify (struct display *d, struct greet_info *greet, struct verify_info *verify)
 {
 	struct passwd	*p;
-#ifndef USE_PAM
-#ifdef USESHADOW
+# ifndef USE_PAM
+#  ifdef USESHADOW
 	struct spwd	*sp;
-#endif
+#  endif
 	char		*user_pass = NULL;
-#endif
-#ifdef __OpenBSD__
+# endif
+# ifdef __OpenBSD__
 	char            *s;
 	struct timeval  tp;
-#endif
+# endif
 	char		*shell, *home;
 	char		**argv;
 
@@ -350,18 +350,18 @@ Verify (struct display *d, struct greet_info *greet, struct verify_info *verify)
 		return 0;
 	}
 
-#if defined(sun) && defined(SVR4)
-	/* Solaris: If CONSOLE is set to /dev/console in /etc/default/login, 
+# if defined(sun) && defined(SVR4)
+	/* Solaris: If CONSOLE is set to /dev/console in /etc/default/login,
 	   then root can only login on system console */
 
-# define SOLARIS_LOGIN_DEFAULTS "/etc/default/login"
+#  define SOLARIS_LOGIN_DEFAULTS "/etc/default/login"
 
 	if (p->pw_uid == 0) {
 	    char *console = NULL, *tmp = NULL;
 	    FILE *fs;
 
 	    if ((fs= fopen(SOLARIS_LOGIN_DEFAULTS, "r")) != NULL)
-	    {   
+	    {
 		char str[120];
 		while (!feof(fs))
 		{
@@ -372,8 +372,8 @@ Verify (struct display *d, struct greet_info *greet, struct verify_info *verify)
 			console = strdup((tmp+8));
 		}
 		fclose(fs);
-                if ( console != NULL && 
-		  (strncmp(console, "/dev/console", 12) == 0) && 
+                if ( console != NULL &&
+		  (strncmp(console, "/dev/console", 12) == 0) &&
 		  (strncmp(d->name,":0",2) != 0) )
 		{
                         Debug("Not on system console\n");
@@ -387,26 +387,26 @@ Verify (struct display *d, struct greet_info *greet, struct verify_info *verify)
 	    else
 	    {
 		Debug("Could not open %s\n", SOLARIS_LOGIN_DEFAULTS);
-	    }	
+	    }
 	}
-#endif    
+# endif
 
-#ifndef USE_PAM /* PAM authentication happened in GreetUser already */
-#ifdef linux
+# ifndef USE_PAM /* PAM authentication happened in GreetUser already */
+#  ifdef linux
 	if (!strcmp(p->pw_passwd, "!") || !strcmp(p->pw_passwd, "*")) {
 	    Debug ("The account is locked, no login allowed.\n");
 	    bzero(greet->password, strlen(greet->password));
 	    return 0;
 	}
-#endif
+#  endif
 	user_pass = p->pw_passwd;
-#ifdef KERBEROS
+#  ifdef KERBEROS
 	if(strcmp(greet->name, "root") != 0){
 		char name[ANAME_SZ];
 		char realm[REALM_SZ];
 		char *q;
 		int ret;
-	    
+
 		if(krb_get_lrealm(realm, 1)){
 			Debug ("Can't get Kerberos realm.\n");
 		} else {
@@ -415,10 +415,10 @@ Verify (struct display *d, struct greet_info *greet, struct verify_info *verify)
 			     TKT_ROOT, d->name);
 		    krb_set_tkt_string(krbtkfile);
 		    unlink(krbtkfile);
-           
-		    ret = krb_verify_user(greet->name, "", realm, 
+
+		    ret = krb_verify_user(greet->name, "", realm,
 				      greet->password, 1, "rcmd");
-           
+
 		    if(ret == KSUCCESS){
 			    chown(krbtkfile, p->pw_uid, p->pw_gid);
 			    Debug("kerberos verify succeeded\n");
@@ -426,9 +426,9 @@ Verify (struct display *d, struct greet_info *greet, struct verify_info *verify)
 				    if (k_setpag() == -1)
 					    LogError ("setpag() failed for %s\n",
 						      greet->name);
-				    
+
 				    if((ret = k_afsklog(NULL, NULL)) != KSUCCESS)
-					    LogError("Warning %s\n", 
+					    LogError("Warning %s\n",
 						     krb_get_err_text(ret));
 			    }
 			    goto done;
@@ -439,8 +439,8 @@ Verify (struct display *d, struct greet_info *greet, struct verify_info *verify)
 		    }
 		}
 	}
-#endif
-#ifdef USESHADOW
+#  endif
+#  ifdef USESHADOW
 	errno = 0;
 	sp = getspnam(greet->name);
 	if (sp == NULL) {
@@ -448,15 +448,15 @@ Verify (struct display *d, struct greet_info *greet, struct verify_info *verify)
 	} else {
 	    user_pass = sp->sp_pwdp;
 	}
-#ifndef QNX4
+#   ifndef QNX4
 	endspent();
-#endif  /* QNX4 doesn't need endspent() to end shadow passwd ops */
-#endif /* USESHADOW */
-#if defined(ultrix) || defined(__ultrix__)
+#   endif  /* QNX4 doesn't need endspent() to end shadow passwd ops */
+#  endif /* USESHADOW */
+#  if defined(ultrix) || defined(__ultrix__)
 	if (authenticate_user(p, greet->password, NULL) < 0)
-#else
+#  else
 	if (strcmp (crypt (greet->password, user_pass), user_pass))
-#endif
+#  endif
 	{
 		if(!greet->allow_null_passwd || strlen(p->pw_passwd) > 0) {
 			Debug ("password verify failed\n");
@@ -464,10 +464,10 @@ Verify (struct display *d, struct greet_info *greet, struct verify_info *verify)
 			return 0;
 		} /* else: null passwd okay */
 	}
-#ifdef KERBEROS
+#  ifdef KERBEROS
 done:
-#endif
-#ifdef __OpenBSD__
+#  endif
+#  ifdef __OpenBSD__
 	/*
 	 * Only accept root logins if allowRootLogin resource is set
 	 */
@@ -477,12 +477,12 @@ done:
 		return 0;
 	}
 	/*
-	 * Shell must be in /etc/shells 
+	 * Shell must be in /etc/shells
 	 */
 	for (;;) {
 		s = getusershell();
 		if (s == NULL) {
-			/* did not found the shell in /etc/shells 
+			/* did not found the shell in /etc/shells
 			   -> failure */
 			Debug("shell not in /etc/shells\n");
 			bzero(greet->password, strlen(greet->password));
@@ -494,7 +494,7 @@ done:
 			endusershell();
 			break;
 		}
-	} 
+	}
 	/*
 	 * Test for expired password
 	 */
@@ -512,12 +512,12 @@ done:
 			Debug("account has expired.\n");
 			bzero(greet->password, strlen(greet->password));
 			return 0;
-		} 
+		}
 	}
-#endif /* __OpenBSD__ */
+#  endif /* __OpenBSD__ */
 	bzero(user_pass, strlen(user_pass)); /* in case shadow password */
 
-#endif /* USE_PAM */
+# endif /* USE_PAM */
 #endif /* USE_BSDAUTH */
 
 	Debug ("verify succeeded\n");