Ignore:
Timestamp:
Nov 27, 2012, 4:43:17 PM (13 years ago)
Author:
Silvan Scherrer
Message:

Samba Server: updated trunk to 3.6.0

Location:
trunk/server
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/server

  • trunk/server/source4/heimdal_build/config.h

    r414 r745  
    99#include "include/config.h"
    1010#include "../replace/replace.h"
     11#include "../lib/util/attr.h"
     12#define HEIMDAL_NORETURN_ATTRIBUTE _NORETURN_
     13#define HEIMDAL_PRINTF_ATTRIBUTE(x) FORMAT_ATTRIBUTE(x)
     14#define VERSIONLIST {"Lorikeet-Heimdal, Modified for Samba4"}
    1115
    12 #if !defined(HAVE_DIRFD) && !defined(HAVE_DIRFD_DECL) && !defined(dirfd)
    13 #define dirfd(d) (-1)
    14 #endif
     16#define VERSION "Samba"
     17
     18#define PACKAGE VERSION
     19#define PACKAGE_BUGREPORT "https://bugzilla.samba.org/"
     20#define PACKAGE_VERSION VERSION
    1521
    1622#define RCSID(msg) struct __rcsid { int __rcsdi; }
     
    2834#undef HAVE_KRB5_ENCRYPT_BLOCK
    2935
    30 #if defined(UID_WRAPPER)
    31 #if !defined(UID_WRAPPER_REPLACE) && !defined(UID_WRAPPER_NOT_REPLACE)
    32 #define UID_WRAPPER_REPLACE
    33 #include "../uid_wrapper/uid_wrapper.h"
    34 #endif
    35 #else
    36 #define uwrap_enabled() 0
     36/* Because it can't be defined in roken.h */
     37#ifndef USE_HCRYPTO_IMATH
     38#define USE_HCRYPTO_IMATH
    3739#endif
    3840
     41/*Workaround for heimdal define vs samba define*/
     42#ifdef HAVE_LIBINTL_H
     43#define LIBINTL
    3944#endif
     45
     46/* heimdal now wants some atomic ops - ask for the non-atomic ones for Samba */
     47#define HEIM_BASE_NON_ATOMIC 1
     48
     49#endif
Note: See TracChangeset for help on using the changeset viewer.