diff options
| -rw-r--r-- | source4/auth/config.mk | 3 | ||||
| -rw-r--r-- | source4/auth/gensec/config.mk | 5 | ||||
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 1 | ||||
| -rw-r--r-- | source4/build/smb_build/summary.pm | 4 | ||||
| -rw-r--r-- | source4/lib/registry/tools/regtree.c | 4 | ||||
| -rw-r--r-- | source4/lib/tls/tlscert.c | 5 | ||||
| -rw-r--r-- | source4/utils/ntlm_auth.c | 1 |
7 files changed, 13 insertions, 10 deletions
diff --git a/source4/auth/config.mk b/source4/auth/config.mk index 018bc61ecc..9534f23023 100644 --- a/source4/auth/config.mk +++ b/source4/auth/config.mk @@ -6,7 +6,7 @@ include credentials/config.mk [SUBSYSTEM::auth_sam] PRIVATE_PROTO_HEADER = auth_sam.h -OBJ_FILES = sam.o auth_sam_reply.o +OBJ_FILES = sam.o auth_sam_reply.o ntlm_check.o PUBLIC_DEPENDENCIES = SAMDB ####################### @@ -71,7 +71,6 @@ PUBLIC_PROTO_HEADER = auth_proto.h OBJ_FILES = \ auth.o \ auth_util.o \ - ntlm_check.o \ auth_simple.o PUBLIC_DEPENDENCIES = LIBSECURITY process_model SAMDB # End SUBSYSTEM auth diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk index 3906c93065..5aeca28689 100644 --- a/source4/auth/gensec/config.mk +++ b/source4/auth/gensec/config.mk @@ -8,7 +8,7 @@ PUBLIC_HEADERS = gensec.h spnego.h PUBLIC_PROTO_HEADER = gensec_proto.h OBJ_FILES = gensec.o PUBLIC_DEPENDENCIES = \ - CREDENTIALS LIBSAMBA-UTIL LIBCRYPTO + CREDENTIALS LIBSAMBA-UTIL LIBCRYPTO ASN1_UTIL # End SUBSYSTEM gensec ################################# @@ -28,7 +28,7 @@ PUBLIC_DEPENDENCIES = KERBEROS auth auth_sam SUBSYSTEM = gensec INIT_FUNCTION = gensec_gssapi_init OBJ_FILES = gensec_gssapi.o -PUBLIC_DEPENDENCIES = KERBEROS auth +PUBLIC_DEPENDENCIES = KERBEROS auth HEIMDAL_GSSAPI # End MODULE gensec_gssapi ################################################ @@ -38,6 +38,7 @@ PUBLIC_DEPENDENCIES = KERBEROS auth SUBSYSTEM = gensec INIT_FUNCTION = gensec_spnego_init PRIVATE_PROTO_HEADER = spnego_proto.h +PRIVATE_DEPENDENCIES = ASN1_UTIL OBJ_FILES = spnego.o \ spnego_parse.o # End MODULE gensec_spnego diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index b422cbc307..2e92ed0b1a 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -339,6 +339,7 @@ sub StaticLibrary($$) # $ctx->{TARGET}: \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST) \@echo Linking \$@ + \@rm -f \$@ \@\$(STLD) \$(STLD_FLAGS) \$@ \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST) __EOD__ diff --git a/source4/build/smb_build/summary.pm b/source4/build/smb_build/summary.pm index d61d41a726..becc627063 100644 --- a/source4/build/smb_build/summary.pm +++ b/source4/build/smb_build/summary.pm @@ -55,9 +55,9 @@ sub show($$) ? "yes" : "no (install GNU make >= 3.81)") . "\n"; - print "Using shared libraries internally (experimental): " . + print "Using shared libraries: " . (enabled($config->{BLDSHARED}) - ? "yes" : "no (try --enable-dso)") . + ? "yes" : "no (not supported on this system)") . "\n"; print "\n"; diff --git a/source4/lib/registry/tools/regtree.c b/source4/lib/registry/tools/regtree.c index b0e1c46d9c..dae8c389c2 100644 --- a/source4/lib/registry/tools/regtree.c +++ b/source4/lib/registry/tools/regtree.c @@ -99,13 +99,13 @@ int main(int argc, char **argv) POPT_TABLEEND }; - registry_init(); - pc = poptGetContext(argv[0], argc, (const char **) argv, long_options,0); while((opt = poptGetNextOpt(pc)) != -1) { } + registry_init(); + if (remote) { error = reg_open_remote(&h, NULL, cmdline_credentials, remote, NULL); } else if (backend) { diff --git a/source4/lib/tls/tlscert.c b/source4/lib/tls/tlscert.c index ab06f8617c..3956475ea0 100644 --- a/source4/lib/tls/tlscert.c +++ b/source4/lib/tls/tlscert.c @@ -30,6 +30,7 @@ #define UNIT_NAME "Samba - temporary autogenerated certificate" #define COMMON_NAME "Samba" #define LIFETIME 700*24*60*60 +#define DH_BITS 1024 /* auto-generate a set of self signed certificates @@ -67,11 +68,11 @@ void tls_cert_generate(TALLOC_CTX *mem_ctx, DEBUG(3,("Generating private key\n")); TLSCHECK(gnutls_x509_privkey_init(&key)); - TLSCHECK(gnutls_x509_privkey_generate(key, GNUTLS_PK_RSA, 1024, 0)); + TLSCHECK(gnutls_x509_privkey_generate(key, GNUTLS_PK_RSA, DH_BITS, 0)); DEBUG(3,("Generating CA private key\n")); TLSCHECK(gnutls_x509_privkey_init(&cakey)); - TLSCHECK(gnutls_x509_privkey_generate(cakey, GNUTLS_PK_RSA, 1024, 0)); + TLSCHECK(gnutls_x509_privkey_generate(cakey, GNUTLS_PK_RSA, DH_BITS, 0)); DEBUG(3,("Generating CA certificate\n")); TLSCHECK(gnutls_x509_crt_init(&cacrt)); diff --git a/source4/utils/ntlm_auth.c b/source4/utils/ntlm_auth.c index c7f3767a22..55aa4e65a9 100644 --- a/source4/utils/ntlm_auth.c +++ b/source4/utils/ntlm_auth.c @@ -26,6 +26,7 @@ #include "system/filesys.h" #include "lib/cmdline/popt_common.h" #include "auth/auth.h" +#include "auth/auth_sam.h" #include "pstring.h" #include "libcli/auth/libcli_auth.h" #include "libcli/security/security.h" |