diff options
| author | Jeremy Allison <jra@samba.org> | 2008-11-12 19:27:50 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-11-12 19:27:50 -0800 |
| commit | 1a89b9f5f3d0e99363b333a1068c1043b65cfb99 (patch) | |
| tree | c99d9faf3f590bb31d801033c7f6cd1d8a1495ad | |
| parent | 6f0be6c5d580ea751b28a0166b4454a0ef333dc2 (diff) | |
| parent | 9efed3b93632fcb934fa548194536802dcc3c287 (diff) | |
| download | samba-1a89b9f5f3d0e99363b333a1068c1043b65cfb99.tar.gz samba-1a89b9f5f3d0e99363b333a1068c1043b65cfb99.tar.bz2 samba-1a89b9f5f3d0e99363b333a1068c1043b65cfb99.zip | |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
| -rw-r--r-- | source3/winbindd/winbindd_passdb.c | 1 | ||||
| -rw-r--r-- | source4/build/m4/check_python.m4 | 15 |
2 files changed, 14 insertions, 2 deletions
diff --git a/source3/winbindd/winbindd_passdb.c b/source3/winbindd/winbindd_passdb.c index 5677c01be1..0cf4540cfe 100644 --- a/source3/winbindd/winbindd_passdb.c +++ b/source3/winbindd/winbindd_passdb.c @@ -267,6 +267,7 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain, } if ( !pdb_getsampwsid( user, user_sid ) ) { + TALLOC_FREE( user ); return NT_STATUS_NO_SUCH_USER; } diff --git a/source4/build/m4/check_python.m4 b/source4/build/m4/check_python.m4 index 96f93a3d75..7e56af76f7 100644 --- a/source4/build/m4/check_python.m4 +++ b/source4/build/m4/check_python.m4 @@ -71,8 +71,19 @@ AC_DEFUN([AC_SAMBA_PYTHON_DEVEL], if test x$PYTHON != x then - DISTUTILS_CFLAGS=`$PYTHON -c "from distutils import sysconfig; print '-I%s -I%s %s' % (sysconfig.get_python_inc(), sysconfig.get_python_inc(plat_specific=1), sysconfig.get_config_var('CFLAGS'))"` - DISTUTILS_LDFLAGS=`$PYTHON -c "from distutils import sysconfig; print '%s %s -lpython%s -L%s' % (sysconfig.get_config_var('LIBS'), sysconfig.get_config_var('SYSLIBS'), sysconfig.get_config_var('VERSION'), sysconfig.get_config_var('LIBPL'))"` + DISTUTILS_CFLAGS=`$PYTHON -c "from distutils import sysconfig; \ + print '-I%s -I%s %s' % ( \ + sysconfig.get_python_inc(), \ + sysconfig.get_python_inc(plat_specific=1), \ + sysconfig.get_config_var('CFLAGS'))"` + DISTUTILS_LDFLAGS=`$PYTHON -c "from distutils import sysconfig; \ + print '%s %s -lpython%s -L%s %s -L%s' % ( \ + sysconfig.get_config_var('LIBS'), \ + sysconfig.get_config_var('SYSLIBS'), \ + sysconfig.get_config_var('VERSION'), \ + sysconfig.get_config_var('LIBDIR'), \ + sysconfig.get_config_var('LDFLAGS'), \ + sysconfig.get_config_var('LIBPL'))"` TRY_LINK_PYTHON($DISTUTILS_LDFLAGS, $DISTUTILS_CFLAGS) fi |