Author: jelmer Date: 2007-11-17 00:18:51 +0000 (Sat, 17 Nov 2007) New Revision: 26010
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26010 Log: Merge upstream. Modified: branches/4.0-python/ branches/4.0-python/source/auth/auth_unix.c branches/4.0-python/source/auth/config.mk branches/4.0-python/source/build/m4/check_ld.m4 branches/4.0-python/source/build/smb_build/main.pl branches/4.0-python/source/dsdb/config.mk branches/4.0-python/source/librpc/config.mk branches/4.0-python/source/param/config.mk branches/4.0-python/source/smbd/config.mk branches/4.0-python/source/utils/config.mk Changeset: Property changes on: branches/4.0-python ___________________________________________________________________ Name: bzr:revision-info ...skipped... Name: bzr:ancestry:v3-trunk0 ...skipped... Name: bzr:file-ids ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/4.0-python/source/auth/auth_unix.c =================================================================== --- branches/4.0-python/source/auth/auth_unix.c 2007-11-17 00:18:44 UTC (rev 26009) +++ branches/4.0-python/source/auth/auth_unix.c 2007-11-17 00:18:51 UTC (rev 26010) @@ -236,7 +236,7 @@ pam_error = pam_start("samba", account_name, pconv, pamh); if (pam_error != PAM_SUCCESS) { - /* no vaild pamh here, can we reliably call pam_strerror ? */ + /* no valid pamh here, can we reliably call pam_strerror ? */ DEBUG(4,("smb_pam_start: pam_start failed!\n")); return NT_STATUS_UNSUCCESSFUL; } Modified: branches/4.0-python/source/auth/config.mk =================================================================== --- branches/4.0-python/source/auth/config.mk 2007-11-17 00:18:44 UTC (rev 26009) +++ branches/4.0-python/source/auth/config.mk 2007-11-17 00:18:51 UTC (rev 26010) @@ -50,15 +50,11 @@ # End MODULE auth_developer ####################### -####################### -# Start MODULE auth_unix [MODULE::auth_unix] INIT_FUNCTION = auth_unix_init SUBSYSTEM = auth OBJ_FILES = auth_unix.o PRIVATE_DEPENDENCIES = CRYPT PAM PAM_ERRORS NSS_WRAPPER -# End MODULE auth_unix -####################### [SUBSYSTEM::PAM_ERRORS] PRIVATE_PROTO_HEADER = pam_errors.h Modified: branches/4.0-python/source/build/m4/check_ld.m4 =================================================================== --- branches/4.0-python/source/build/m4/check_ld.m4 2007-11-17 00:18:44 UTC (rev 26009) +++ branches/4.0-python/source/build/m4/check_ld.m4 2007-11-17 00:18:51 UTC (rev 26010) @@ -105,6 +105,7 @@ AC_LIBREPLACE_SHLD_FLAGS AC_LIBREPLACE_MDLD AC_LIBREPLACE_MDLD_FLAGS +AC_LIBREPLACE_RUNTIME_LIB_PATH_VAR ####################################################### # test whether building a shared library actually works Modified: branches/4.0-python/source/build/smb_build/main.pl =================================================================== --- branches/4.0-python/source/build/smb_build/main.pl 2007-11-17 00:18:44 UTC (rev 26009) +++ branches/4.0-python/source/build/smb_build/main.pl 2007-11-17 00:18:51 UTC (rev 26010) @@ -54,6 +54,8 @@ $mkenv->Integrated($key) if grep(/INTEGRATED/, @{$key->{OUTPUT_TYPE}}); } +my $shared_libs_used = 0; + foreach my $key (values %$OUTPUT) { next unless defined $key->{OUTPUT_TYPE}; @@ -63,6 +65,10 @@ $mkenv->SharedLibrary($key) if ($key->{TYPE} eq "LIBRARY" or $key->{TYPE} eq "PYTHON") and grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}}); + if ($key->{TYPE} eq "LIBRARY" and + ${$key->{OUTPUT_TYPE}}[0] eq "SHARED_LIBRARY") { + $shared_libs_used = 1; + } $mkenv->SharedModule($key) if $key->{TYPE} eq "MODULE" and grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}}); $mkenv->Binary($key) if grep(/BINARY/, @{$key->{OUTPUT_TYPE}}); @@ -80,4 +86,11 @@ summary::show($OUTPUT, \%config::config); +if ($shared_libs_used) { + print <<EOF; +To run binaries without installing, set the following environment variable: + $config::config{LIB_PATH_VAR}=$config::config{builddir}/bin/shared +EOF +} + 1; Modified: branches/4.0-python/source/dsdb/config.mk =================================================================== --- branches/4.0-python/source/dsdb/config.mk 2007-11-17 00:18:44 UTC (rev 26009) +++ branches/4.0-python/source/dsdb/config.mk 2007-11-17 00:18:51 UTC (rev 26010) @@ -7,9 +7,8 @@ PUBLIC_PROTO_HEADER = samdb/samdb_proto.h PUBLIC_HEADERS = samdb/samdb.h PUBLIC_DEPENDENCIES = LIBCLI_LDAP HEIMDAL_KRB5 -PRIVATE_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI NDR_DRSBLOBS \ +PRIVATE_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI NDR_DRSBLOBS NSS_WRAPPER \ auth_util UTIL_LDB -LDFLAGS = $(LIBRARY_ldb_OUTPUT) OBJ_FILES = \ samdb/samdb.o \ samdb/samdb_privilege.o \ Modified: branches/4.0-python/source/librpc/config.mk =================================================================== --- branches/4.0-python/source/librpc/config.mk 2007-11-17 00:18:44 UTC (rev 26009) +++ branches/4.0-python/source/librpc/config.mk 2007-11-17 00:18:51 UTC (rev 26010) @@ -27,7 +27,8 @@ LIBSAMBA-UTIL \ LIBPOPT \ POPT_SAMBA \ - NDR_TABLE + NDR_TABLE \ + LIBSAMBA-ERRORS MANPAGE = tools/ndrdump.1 # FIXME: ndrdump shouldn't have to depend on RPC... # End BINARY ndrdump Modified: branches/4.0-python/source/param/config.mk =================================================================== --- branches/4.0-python/source/param/config.mk 2007-11-17 00:18:44 UTC (rev 26009) +++ branches/4.0-python/source/param/config.mk 2007-11-17 00:18:51 UTC (rev 26010) @@ -47,4 +47,4 @@ [SUBSYSTEM::SECRETS] OBJ_FILES = secrets.o -PRIVATE_DEPENDENCIES = TDB_WRAP UTIL_TDB LDB_WRAP +PRIVATE_DEPENDENCIES = LDB_WRAP TDB_WRAP UTIL_TDB Modified: branches/4.0-python/source/smbd/config.mk =================================================================== --- branches/4.0-python/source/smbd/config.mk 2007-11-17 00:18:44 UTC (rev 26009) +++ branches/4.0-python/source/smbd/config.mk 2007-11-17 00:18:51 UTC (rev 26010) @@ -19,7 +19,7 @@ service_stream.o \ service_task.o PRIVATE_DEPENDENCIES = \ - MESSAGING + MESSAGING samba-socket # End SUBSYSTEM SERVER ####################### Modified: branches/4.0-python/source/utils/config.mk =================================================================== --- branches/4.0-python/source/utils/config.mk 2007-11-17 00:18:44 UTC (rev 26009) +++ branches/4.0-python/source/utils/config.mk 2007-11-17 00:18:51 UTC (rev 26010) @@ -32,7 +32,8 @@ LIBSAMBA-CONFIG \ LIBSAMBA-UTIL \ NDR_XATTR \ - WRAP_XATTR + WRAP_XATTR \ + LIBSAMBA-ERRORS # End BINARY getntacl #################################
