diff options
| -rw-r--r-- | howto.txt | 30 | ||||
| -rw-r--r-- | source4/heimdal_build/glue.c | 3 | ||||
| -rw-r--r-- | source4/include/includes.h | 4 |
3 files changed, 8 insertions, 29 deletions
@@ -29,30 +29,6 @@ version at some future date using: $ cd samba4 $ svn up -Step 1a: Use Lorikeet/Heimdal ------------------------------ - -If you want to use Kerberos in Samba4, you must use -'Lorikeet/heimdal', and place a checkout into samba4/source/heimdal - -There are 2 methods of doing this: - - method 1: - $ cd samba4/source - $ rsync -avz samba.org::ftp/unpacked/lorikeet-heimdal heimdal - - method 2: - - $ cd samba4/source - $ svn co svn://svnanon.samba.org/lorikeet/trunk/heimdal heimdal - -both methods will create a directory called "heimdal" in the samba4/source -directory. - -(Long-term, we will either import Heimdal from 'lorikeet', or setup a -reference between the repositories, so this and svn update works -automaticly. In the short term, you must manually update this directory). - Step 2: compile Samba4 ---------------------- @@ -60,13 +36,13 @@ Run this: $ cd samba4/source $ ./autogen.sh - $ ./configure.developer -C + $ ./configure.developer If you did not include heimdal, run this: $ make proto all If you did include Heimdal, a different step is required: - $ make proto HEIMDAL_EXTERNAL all + $ make proto all If you have gcc 3.4 or newer, then substitue "pch" for "proto" to greatly speed up the compile process (about 5x faster). @@ -88,7 +64,7 @@ Step 4: provision Samba4 The "provision" step sets up a basic user database. $ cd source - $ ./setup/provision.pl --realm=YOUR.REALM --domain=YOURDOM --adminpass=SOMEPASSWORD + $ ./setup/provision --realm=YOUR.REALM --domain=YOURDOM --adminpass=SOMEPASSWORD This will create a number of new 'ldb' database files in a directory newdb.XXX. You need to move these to the "private" subdirectory of diff --git a/source4/heimdal_build/glue.c b/source4/heimdal_build/glue.c index d3ac8ee5b2..1c74b39d11 100644 --- a/source4/heimdal_build/glue.c +++ b/source4/heimdal_build/glue.c @@ -23,12 +23,11 @@ #include "includes.h" #include "system/network.h" #include "system/kerberos.h" -#include "err.h" /* get the list of IP addresses for configured interfaces */ -krb5_error_code krb5_get_all_client_addrs(krb5_context context, krb5_addresses *res) +krb5_error_code KRB5_LIB_FUNCTION krb5_get_all_client_addrs(krb5_context context, krb5_addresses *res) { int i; res->len = iface_count(); diff --git a/source4/include/includes.h b/source4/include/includes.h index 00054b985d..cedd51b6f3 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -64,6 +64,10 @@ #include <winsock2.h> #endif +#ifdef HAVE_WS2TCPIP_H +#include <ws2tcpip.h> +#endif + #ifdef HAVE_WINDOWS_H #include <windows.h> #endif |