commit 03457135b727fc39bb6601b8fb434db2680edc82
from: Alexander Barton <alex@barton.de>
date: Mon Jul 12 11:22:48 2010 UTC

Use correct preprocessor syntax when testing for PAM and IDENTAUTH

commit - 28424d013d4909a7d5a2501537ad39ae74873724
commit + 03457135b727fc39bb6601b8fb434db2680edc82
blob - 44123eaa0b8d9af5444f0098b5fe1d656017b2b2
blob + 8402499936e02c530f81592c3c385a0e1f85a947
--- src/ngircd/client.c
+++ src/ngircd/client.c
@@ -367,7 +367,7 @@ Client_SetOrigUser(CLIENT *Client, const char *User) {
 	assert(Client != NULL);
 	assert(User != NULL);
 
-#ifdef PAM & IDENTAUTH
+#if defined(PAM) && defined(IDENTAUTH)
 	strlcpy(Client->orig_user, User, sizeof(Client->orig_user));
 #endif
 } /* Client_SetOrigUser */
blob - 352ddf3898550b28f19baeca77558f8bd808f3c4
blob + bd000a564772f367ffb19a50b9722dc1277c8cd7
--- src/ngircd/client.h
+++ src/ngircd/client.h
@@ -43,7 +43,7 @@ typedef struct _CLIENT
 	char pwd[CLIENT_PASS_LEN];	/* password received of the client */
 	char host[CLIENT_HOST_LEN];	/* hostname of the client */
 	char user[CLIENT_USER_LEN];	/* user name ("login") */
-#ifdef PAM & IDENTAUTH
+#if defined(PAM) && defined(IDENTAUTH)
 	char orig_user[CLIENT_USER_LEN];/* user name supplied by USER command */
 #endif
 	char info[CLIENT_INFO_LEN];	/* long user name (user) / info text (server) */