From 30cc264176de210393bc19c5998c9d4580f18d65 Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Thu, 12 Sep 2002 22:24:09 +0000
Subject: [PATCH] * mcserv.c: Declare crypt if crypt.h is missing and we are
 not using PAM.

---
 vfs/ChangeLog |  9 +++++++--
 vfs/mcserv.c  | 15 +++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index dfbc1b2b8..5f06cd358 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,10 +1,15 @@
+2002-09-12  Pavel Roskin  <proski@gnu.org>
+
+	* mcserv.c: Declare crypt if crypt.h is missing and we are not
+	using PAM.
+
 2002-09-11  Andrew V. Samoilov  <sav@bcs.zp.ua>
 
 	* smbfs.c (statfile_helper): Merge with loaddir_helper().
-	(get_remote_stat): Use loaddir_helper().  Care about 
+	(get_remote_stat): Use loaddir_helper().  Care about
 	single_entry instead of eliminated statfile_helper().
 
-	* samba/libsmb/clientgen.c (cli_NetServerEnum): Add void* 
+	* samba/libsmb/clientgen.c (cli_NetServerEnum): Add void*
 	parameter to (*fn)() and void *state parameter.
 	(cli_list): Likewise.
 	(cli_RNetShareEnum): Likewise.  Return int.
diff --git a/vfs/mcserv.c b/vfs/mcserv.c
index 5e8ee9bf6..bbe2c1fae 100644
--- a/vfs/mcserv.c
+++ b/vfs/mcserv.c
@@ -51,9 +51,6 @@
 #ifdef HAVE_GRP_H
 #    include <grp.h>
 #endif
-#ifdef HAVE_CRYPT_H
-#    include <crypt.h>
-#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
@@ -82,7 +79,13 @@
 #    ifndef PAM_ESTABLISH_CRED
 #        define PAM_ESTABLISH_CRED PAM_CRED_ESTABLISH
 #    endif
-#endif
+#else
+#ifdef HAVE_CRYPT_H
+#    include <crypt.h>
+#else
+extern char *crypt (const char *, const char *);
+#endif /* !HAVE_CRYPT_H */
+#endif /* !HAVE_PAM */
 
 #include "utilvfs.h"
 
@@ -815,10 +818,6 @@ static int do_ftp_auth (char *username, char *password)
     return 0;
 }
 
-#ifdef NEED_CRYPT_PROTOTYPE
-extern char *crypt (const char *, const char *);
-#endif
-
 static int do_classic_auth (char *username, char *password)
 {
     struct passwd *this;