mirror of
https://github.com/MidnightCommander/mc
synced 2025-04-12 18:12:55 +03:00
* mcserv.c: Use HAVE_CRYPT instead of USE_CRYPT. Remove
references to HAVE_LIBCRYPT and HAVE_LIBCRYPT_I. Reported by Christian Laubscher <christian.laubscher@tiscalinet.ch>
This commit is contained in:
parent
1d6ab07a10
commit
a8261b28d6
@ -1,5 +1,9 @@
|
|||||||
2004-01-22 Pavel Roskin <proski@gnu.org>
|
2004-01-22 Pavel Roskin <proski@gnu.org>
|
||||||
|
|
||||||
|
* mcserv.c: Use HAVE_CRYPT instead of USE_CRYPT. Remove
|
||||||
|
references to HAVE_LIBCRYPT and HAVE_LIBCRYPT_I. Reported by
|
||||||
|
Christian Laubscher <christian.laubscher@tiscalinet.ch>
|
||||||
|
|
||||||
* samba/configure.in: Rename to ...
|
* samba/configure.in: Rename to ...
|
||||||
* samba/configure.ac: ... this. Adjust dependencies.
|
* samba/configure.ac: ... this. Adjust dependencies.
|
||||||
|
|
||||||
|
10
vfs/mcserv.c
10
vfs/mcserv.c
@ -86,10 +86,6 @@
|
|||||||
# include <crypt.h>
|
# include <crypt.h>
|
||||||
#endif /* !HAVE_CRYPT_H */
|
#endif /* !HAVE_CRYPT_H */
|
||||||
|
|
||||||
#if defined(HAVE_LIBCRYPT) || defined(HAVE_LIBCRYPT_I)
|
|
||||||
# define USE_CRYPT
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_SHADOW_H
|
#ifdef HAVE_SHADOW_H
|
||||||
# include <shadow.h>
|
# include <shadow.h>
|
||||||
#else
|
#else
|
||||||
@ -886,7 +882,7 @@ do_ftp_auth (char *username, char *password)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef USE_CRYPT
|
#ifdef HAVE_CRYPT
|
||||||
static int
|
static int
|
||||||
do_classic_auth (char *username, char *password)
|
do_classic_auth (char *username, char *password)
|
||||||
{
|
{
|
||||||
@ -920,7 +916,7 @@ do_classic_auth (char *username, char *password)
|
|||||||
endpwent ();
|
endpwent ();
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
#endif /* USE_CRYPT */
|
#endif /* HAVE_CRYPT */
|
||||||
#endif /* !HAVE_PAM */
|
#endif /* !HAVE_PAM */
|
||||||
|
|
||||||
/* Try to authenticate the user based on:
|
/* Try to authenticate the user based on:
|
||||||
@ -947,7 +943,7 @@ do_auth (char *username, char *password)
|
|||||||
auth = 1;
|
auth = 1;
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
#ifdef USE_CRYPT
|
#ifdef HAVE_CRYPT
|
||||||
if (do_classic_auth (username, password))
|
if (do_classic_auth (username, password))
|
||||||
auth = 1;
|
auth = 1;
|
||||||
else
|
else
|
||||||
|
Loading…
x
Reference in New Issue
Block a user