Use correct preprocessor syntax when testing for PAM and IDENTAUTH

This commit is contained in:
Alexander Barton 2010-07-12 13:22:48 +02:00
parent 28424d013d
commit 03457135b7
2 changed files with 2 additions and 2 deletions

View File

@ -367,7 +367,7 @@ Client_SetOrigUser(CLIENT *Client, const char *User) {
assert(Client != NULL); assert(Client != NULL);
assert(User != NULL); assert(User != NULL);
#ifdef PAM & IDENTAUTH #if defined(PAM) && defined(IDENTAUTH)
strlcpy(Client->orig_user, User, sizeof(Client->orig_user)); strlcpy(Client->orig_user, User, sizeof(Client->orig_user));
#endif #endif
} /* Client_SetOrigUser */ } /* Client_SetOrigUser */

View File

@ -43,7 +43,7 @@ typedef struct _CLIENT
char pwd[CLIENT_PASS_LEN]; /* password received of the client */ char pwd[CLIENT_PASS_LEN]; /* password received of the client */
char host[CLIENT_HOST_LEN]; /* hostname of the client */ char host[CLIENT_HOST_LEN]; /* hostname of the client */
char user[CLIENT_USER_LEN]; /* user name ("login") */ 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 */ char orig_user[CLIENT_USER_LEN];/* user name supplied by USER command */
#endif #endif
char info[CLIENT_INFO_LEN]; /* long user name (user) / info text (server) */ char info[CLIENT_INFO_LEN]; /* long user name (user) / info text (server) */