sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-06 16:23:49 +03:00
Code Activity

r15363: Fix dependencies for shared library

Browse Source
This commit is contained in:
Jelmer Vernooij
2006-04-30 18:46:14 +00:00
committed by Gerald (Jerry) Carter
parent c3626548f7
commit f2ca71f122
7 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/auth/config.mk
View File

@@ -6,7 +6,7 @@ include credentials/config.mk
[SUBSYSTEM::auth_sam] [SUBSYSTEM::auth_sam]
PRIVATE_PROTO_HEADER = auth_sam.h 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 PUBLIC_DEPENDENCIES = SAMDB
####################### #######################
@@ -71,7 +71,6 @@ PUBLIC_PROTO_HEADER = auth_proto.h
OBJ_FILES = \ OBJ_FILES = \
auth.o \ auth.o \
auth_util.o \ auth_util.o \
ntlm_check.o \
auth_simple.o auth_simple.o
PUBLIC_DEPENDENCIES = LIBSECURITY process_model SAMDB PUBLIC_DEPENDENCIES = LIBSECURITY process_model SAMDB
# End SUBSYSTEM auth # End SUBSYSTEM auth

5
source/auth/gensec/config.mk
View File

@@ -8,7 +8,7 @@ PUBLIC_HEADERS = gensec.h spnego.h
PUBLIC_PROTO_HEADER = gensec_proto.h PUBLIC_PROTO_HEADER = gensec_proto.h
OBJ_FILES = gensec.o OBJ_FILES = gensec.o
PUBLIC_DEPENDENCIES = \ PUBLIC_DEPENDENCIES = \
CREDENTIALS LIBSAMBA-UTIL LIBCRYPTO CREDENTIALS LIBSAMBA-UTIL LIBCRYPTO ASN1_UTIL
# End SUBSYSTEM gensec # End SUBSYSTEM gensec
################################# #################################
@@ -28,7 +28,7 @@ PUBLIC_DEPENDENCIES = KERBEROS auth auth_sam
SUBSYSTEM = gensec SUBSYSTEM = gensec
INIT_FUNCTION = gensec_gssapi_init INIT_FUNCTION = gensec_gssapi_init
OBJ_FILES = gensec_gssapi.o OBJ_FILES = gensec_gssapi.o
PUBLIC_DEPENDENCIES = KERBEROS auth PUBLIC_DEPENDENCIES = KERBEROS auth HEIMDAL_GSSAPI
# End MODULE gensec_gssapi # End MODULE gensec_gssapi
################################################ ################################################
@@ -38,6 +38,7 @@ PUBLIC_DEPENDENCIES = KERBEROS auth
SUBSYSTEM = gensec SUBSYSTEM = gensec
INIT_FUNCTION = gensec_spnego_init INIT_FUNCTION = gensec_spnego_init
PRIVATE_PROTO_HEADER = spnego_proto.h PRIVATE_PROTO_HEADER = spnego_proto.h
PRIVATE_DEPENDENCIES = ASN1_UTIL
OBJ_FILES = spnego.o \ OBJ_FILES = spnego.o \
spnego_parse.o spnego_parse.o
# End MODULE gensec_spnego # End MODULE gensec_spnego

1
source/build/smb_build/makefile.pm
View File

@@ -339,6 +339,7 @@ sub StaticLibrary($$)
# #
$ctx->{TARGET}: \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST) $ctx->{TARGET}: \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST)
\@echo Linking \$@ \@echo Linking \$@
\@rm -f \$@
\@\$(STLD) \$(STLD_FLAGS) \$@ \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST) \@\$(STLD) \$(STLD_FLAGS) \$@ \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST)
__EOD__ __EOD__

4
source/build/smb_build/summary.pm
View File

@@ -55,9 +55,9 @@ sub show($$)
? "yes" : "no (install GNU make >= 3.81)") . ? "yes" : "no (install GNU make >= 3.81)") .
"\n"; "\n";
print "Using shared libraries internally (experimental): " . print "Using shared libraries: " .
(enabled($config->{BLDSHARED}) (enabled($config->{BLDSHARED})
? "yes" : "no (try --enable-dso)") . ? "yes" : "no (not supported on this system)") .
"\n"; "\n";
print "\n"; print "\n";

4
source/lib/registry/tools/regtree.c
View File

@@ -99,13 +99,13 @@ int main(int argc, char **argv)
POPT_TABLEEND POPT_TABLEEND
}; };
registry_init();
pc = poptGetContext(argv[0], argc, (const char **) argv, long_options,0); pc = poptGetContext(argv[0], argc, (const char **) argv, long_options,0);
while((opt = poptGetNextOpt(pc)) != -1) { while((opt = poptGetNextOpt(pc)) != -1) {
} }
registry_init();
if (remote) { if (remote) {
error = reg_open_remote(&h, NULL, cmdline_credentials, remote, NULL); error = reg_open_remote(&h, NULL, cmdline_credentials, remote, NULL);
} else if (backend) { } else if (backend) {

5
source/lib/tls/tlscert.c
View File

@@ -30,6 +30,7 @@
#define UNIT_NAME "Samba - temporary autogenerated certificate" #define UNIT_NAME "Samba - temporary autogenerated certificate"
#define COMMON_NAME "Samba" #define COMMON_NAME "Samba"
#define LIFETIME 700*24*60*60 #define LIFETIME 700*24*60*60
#define DH_BITS 1024
/* /*
auto-generate a set of self signed certificates 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")); DEBUG(3,("Generating private key\n"));
TLSCHECK(gnutls_x509_privkey_init(&key)); 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")); DEBUG(3,("Generating CA private key\n"));
TLSCHECK(gnutls_x509_privkey_init(&cakey)); 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")); DEBUG(3,("Generating CA certificate\n"));
TLSCHECK(gnutls_x509_crt_init(&cacrt)); TLSCHECK(gnutls_x509_crt_init(&cacrt));

1
source/utils/ntlm_auth.c
View File

@@ -26,6 +26,7 @@
#include "system/filesys.h" #include "system/filesys.h"
#include "lib/cmdline/popt_common.h" #include "lib/cmdline/popt_common.h"
#include "auth/auth.h" #include "auth/auth.h"
#include "auth/auth_sam.h"
#include "pstring.h" #include "pstring.h"
#include "libcli/auth/libcli_auth.h" #include "libcli/auth/libcli_auth.h"
#include "libcli/security/security.h" #include "libcli/security/security.h"