Module: ngircd.git Branch: master Commit: 03457135b727fc39bb6601b8fb434db2680edc82 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=03457...
Author: Alexander Barton alex@barton.de Date: Mon Jul 12 13:22:48 2010 +0200
Use correct preprocessor syntax when testing for PAM and IDENTAUTH
---
src/ngircd/client.c | 2 +- src/ngircd/client.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 44123ea..8402499 100644 --- a/src/ngircd/client.c +++ b/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 */ diff --git a/src/ngircd/client.h b/src/ngircd/client.h index 352ddf3..bd000a5 100644 --- a/src/ngircd/client.h +++ b/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) */