diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-21 14:25:08 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-21 14:25:08 +0100 |
| commit | 1101d7aa57eb559a13cc35422c57e8c5766c2a9c (patch) | |
| tree | 71e8d48b4ee545eab9ad50addbada3069f36f31e /source3 | |
| parent | 1d59fd4d733007ccabb69c945e1da2208c376b96 (diff) | |
| parent | 157864d1e8cb069a3be0aadf71e114f9ae827df3 (diff) | |
| download | samba-1101d7aa57eb559a13cc35422c57e8c5766c2a9c.tar.gz samba-1101d7aa57eb559a13cc35422c57e8c5766c2a9c.tar.bz2 samba-1101d7aa57eb559a13cc35422c57e8c5766c2a9c.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/auth/auth_util.c | 2 | ||||
| -rw-r--r-- | source3/samba4.mk | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c index d2a8591ae6..e3677c41a4 100644 --- a/source3/auth/auth_util.c +++ b/source3/auth/auth_util.c @@ -573,7 +573,7 @@ NTSTATUS make_server_info_sam(auth_serversupplied_info **server_info, } result->sam_account = sampass; - /* Ensure thaat the sampass will be freed with the result */ + /* Ensure that the sampass will be freed with the result */ talloc_steal(result, sampass); result->unix_name = pwd->pw_name; /* Ensure that we keep pwd->pw_name, because we will free pwd below */ diff --git a/source3/samba4.mk b/source3/samba4.mk index c79694edb0..49afa3a2e2 100644 --- a/source3/samba4.mk +++ b/source3/samba4.mk @@ -170,8 +170,11 @@ everything:: $(patsubst %,%4,$(BINARIES)) setup: @ln -sf ../source4/setup setup -SELFTEST4 = $(LD_LIBPATH_OVERRIDE) $(PERL) $(selftestdir)/selftest.pl --prefix=st4 \ +LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin/shared" + +SELFTEST4 = $(LD_LIBPATH_OVERRIDE) EXEEXT="4" $(PERL) $(selftestdir)/selftest.pl --prefix=st4 \ --builddir=$(builddir) --srcdir=$(samba4srcdir) \ + --exeext=4 \ --expected-failures=$(samba4srcdir)/selftest/knownfail \ --format=$(SELFTEST_FORMAT) \ --exclude=$(samba4srcdir)/selftest/skip --testlist="$(samba4srcdir)/selftest/tests.sh|" \ |