Merge branch 'master' of git://git.samba.org/samba

Conflicts:
	source3/include/proto.h

diff --combined source3/include/includes.h
index 65fac79d53137784b666c0569c5359dd634ab016,9b45c408c5fce9b2fbf2fbc85dc3aab1477b6545..c164d285c1f70b010b38eb5d3b8ba387a79277db
--- 1/source3/include/includes.h
--- 2/source3/include/includes.h
+++ b/source3/include/includes.h
@@@ -716,14 -716,6 +716,6 @@@ enum flush_reason_enum 
  #include "modules/nfs4_acls.h"
  #include "nsswitch/libwbclient/wbclient.h"
  
- /* generated rpc server implementation functions */
- #include "librpc/gen_ndr/srv_echo.h"
- #include "librpc/gen_ndr/srv_svcctl.h"
- #include "librpc/gen_ndr/srv_lsa.h"
- #include "librpc/gen_ndr/srv_eventlog.h"
- #include "librpc/gen_ndr/srv_winreg.h"
- #include "librpc/gen_ndr/srv_initshutdown.h"
- 
  /***** automatically generated prototypes *****/
  #ifndef NO_PROTO_H
  #include "proto.h"
@@@ -813,6 -805,10 +805,6 @@@
  #define SYNC_DNS 1
  #endif
  
 -#ifndef HAVE_CRYPT
 -#define crypt ufc_crypt
 -#endif
 -
  #if defined(HAVE_CRYPT16) && defined(HAVE_GETAUTHUID)
  #define ULTRIX_AUTH 1
  #endif
@@@ -1075,6 -1071,7 +1067,6 @@@ ssize_t readahead(int fd, off64_t offse
  #endif
  
  #define CONST_DISCARD(type, ptr)      ((type) ((void *) (ptr)))
 -#define CONST_ADD(type, ptr)          ((type) ((const void *) (ptr)))
  
  void smb_panic( const char *why ) _NORETURN_;
  void dump_core(void) _NORETURN_;