From 748d65a4ac898708dc7d2fd6f2bdee41489fee86 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 20 Aug 1996 15:45:16 +0000
Subject: - fix a bug in NetServerEnum where counted and total were not counted
 correctly if there were multiple instances of a name. This led to the
 infamous "not enough memory" error when browsing (but this isn't the only
 cause of that message)

- fix a triple-chaining bug which affected OpenX following a TconX

- fix a serious nmbd bug that meant nmdb would answer packets that it
wasn't supposed to, causing havoc with browse lists.

- never time out SELF packets. This is an interim fix until I find out
why nmbd thought they should be timed out.
(This used to be commit 2960c3908c2c3b01a1f2b77def60350018d298e1)
---
 source3/include/includes.h | 2 ++
 source3/include/proto.h    | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'source3/include')

diff --git a/source3/include/includes.h b/source3/include/includes.h
index c7acbddc2b..5d5fd7fd55 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -227,11 +227,13 @@ Here come some platform specific sections
 #endif
 #endif
 #ifdef SHADOW_PWD
+#if _LINUX_C_LIB_VERSION_MAJOR < 5
 #ifndef crypt
 #define crypt pw_encrypt
 #endif
 #endif
 #endif
+#endif
 
 #ifdef SUNOS4
 #define SIGNAL_CAST (void (*)(int))
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 9ddf7cb1fd..f257ac0048 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -679,7 +679,6 @@ int reply_coreplus(char *outbuf);
 int reply_lanman1(char *outbuf);
 int reply_lanman2(char *outbuf);
 int reply_nt1(char *outbuf);
-void parse_connect(char *buf,char *service,char *user,char *password,int *pwlen,char *dev);
 void close_cnum(int cnum, int uid);
 BOOL yield_connection(int cnum,char *name,int max_connections);
 BOOL claim_connection(int cnum,char *name,int max_connections,BOOL Clear);
-- 
cgit