svn commit: samba r15363 - in branches/SAMBA_4_0/source: auth
auth/gensec build/smb_build lib/registry/tools lib/tls utils
jelmer at samba.org
jelmer at samba.org
Sun Apr 30 18:46:15 GMT 2006
Author: jelmer
Date: 2006-04-30 18:46:14 +0000 (Sun, 30 Apr 2006)
New Revision: 15363
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15363
Log:
Fix dependencies for shared library
Modified:
branches/SAMBA_4_0/source/auth/config.mk
branches/SAMBA_4_0/source/auth/gensec/config.mk
branches/SAMBA_4_0/source/build/smb_build/makefile.pm
branches/SAMBA_4_0/source/build/smb_build/summary.pm
branches/SAMBA_4_0/source/lib/registry/tools/regtree.c
branches/SAMBA_4_0/source/lib/tls/tlscert.c
branches/SAMBA_4_0/source/utils/ntlm_auth.c
Changeset:
Modified: branches/SAMBA_4_0/source/auth/config.mk
===================================================================
--- branches/SAMBA_4_0/source/auth/config.mk 2006-04-30 18:45:43 UTC (rev 15362)
+++ branches/SAMBA_4_0/source/auth/config.mk 2006-04-30 18:46:14 UTC (rev 15363)
@@ -6,7 +6,7 @@
[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 @@
OBJ_FILES = \
auth.o \
auth_util.o \
- ntlm_check.o \
auth_simple.o
PUBLIC_DEPENDENCIES = LIBSECURITY process_model SAMDB
# End SUBSYSTEM auth
Modified: branches/SAMBA_4_0/source/auth/gensec/config.mk
===================================================================
--- branches/SAMBA_4_0/source/auth/gensec/config.mk 2006-04-30 18:45:43 UTC (rev 15362)
+++ branches/SAMBA_4_0/source/auth/gensec/config.mk 2006-04-30 18:46:14 UTC (rev 15363)
@@ -8,7 +8,7 @@
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 @@
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 @@
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
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2006-04-30 18:45:43 UTC (rev 15362)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2006-04-30 18:46:14 UTC (rev 15363)
@@ -339,6 +339,7 @@
#
$ctx->{TARGET}: \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST)
\@echo Linking \$@
+ \@rm -f \$@
\@\$(STLD) \$(STLD_FLAGS) \$@ \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST)
__EOD__
Modified: branches/SAMBA_4_0/source/build/smb_build/summary.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/summary.pm 2006-04-30 18:45:43 UTC (rev 15362)
+++ branches/SAMBA_4_0/source/build/smb_build/summary.pm 2006-04-30 18:46:14 UTC (rev 15363)
@@ -55,9 +55,9 @@
? "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";
Modified: branches/SAMBA_4_0/source/lib/registry/tools/regtree.c
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/tools/regtree.c 2006-04-30 18:45:43 UTC (rev 15362)
+++ branches/SAMBA_4_0/source/lib/registry/tools/regtree.c 2006-04-30 18:46:14 UTC (rev 15363)
@@ -99,13 +99,13 @@
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) {
Modified: branches/SAMBA_4_0/source/lib/tls/tlscert.c
===================================================================
--- branches/SAMBA_4_0/source/lib/tls/tlscert.c 2006-04-30 18:45:43 UTC (rev 15362)
+++ branches/SAMBA_4_0/source/lib/tls/tlscert.c 2006-04-30 18:46:14 UTC (rev 15363)
@@ -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 @@
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));
Modified: branches/SAMBA_4_0/source/utils/ntlm_auth.c
===================================================================
--- branches/SAMBA_4_0/source/utils/ntlm_auth.c 2006-04-30 18:45:43 UTC (rev 15362)
+++ branches/SAMBA_4_0/source/utils/ntlm_auth.c 2006-04-30 18:46:14 UTC (rev 15363)
@@ -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"
More information about the samba-cvs
mailing list