summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1998-10-15 00:55:17 +0000
committerJeremy Allison <jra@samba.org>1998-10-15 00:55:17 +0000
commitfc7d3e4caa7650c02ef36fff83b64b06050f66b1 (patch)
tree8fbe7f4ec700a5f2f42397683783e7d19249337a /source3/include
parentbc747b8a077d22344aa03bbba202f5137b59284d (diff)
downloadsamba-fc7d3e4caa7650c02ef36fff83b64b06050f66b1.tar.gz
samba-fc7d3e4caa7650c02ef36fff83b64b06050f66b1.tar.bz2
samba-fc7d3e4caa7650c02ef36fff83b64b06050f66b1.zip
config: Fix crypt prototype on RedHat Linux.
include/includes.h: Fix crypt prototype on RedHat Linux. smbd/fileio.c: Fix mmap bug found by WinCE client. smbd/ipc.c: Fix WinCE wierdness with pipes being opened as \server\pipe\lanman smbd/password.c: Fix encrypted null passwords. Jeremy. (This used to be commit 475992730c0ecbf31c09b3518df2f0354cec61da)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/config.h.in1
-rw-r--r--source3/include/includes.h5
2 files changed, 6 insertions, 0 deletions
diff --git a/source3/include/config.h.in b/source3/include/config.h.in
index 1018e17b35..3a897725dc 100644
--- a/source3/include/config.h.in
+++ b/source3/include/config.h.in
@@ -118,6 +118,7 @@
#undef HAVE_FILE_MACRO
#undef HAVE_FUNCTION_MACRO
#undef HAVE_SETRESUID_DECL
+#undef HAVE_CRYPT_DECL
#undef HAVE_SETRESUID
#undef WITH_NETATALK
#undef HAVE_INO64_T
diff --git a/source3/include/includes.h b/source3/include/includes.h
index fdfd1d3d37..59d43d8a36 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -674,6 +674,11 @@ int setresuid(uid_t ruid, uid_t euid, uid_t suid);
int setresgid(gid_t rgid, gid_t egid, gid_t sgid);
#endif
+#if (defined(HAVE_CRYPT) && !defined(HAVE_CRYPT_DECL))
+/* stupid glibc */
+int crypt(const char *key, const char *salt);
+#endif
+
#if !defined(HAVE_BZERO) && defined(HAVE_MEMSET)
#define bzero(a,b) memset((a),'\0',(b))
#endif