[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  4ae950d2.. ѕ3:buildsystem: fix depenencies for libreplace
       via  72cec4a... ѕ3:ldap: search for account policies in objectclass 
sambaDomain, not *
      from  d1ad143... s3/docs: Fix typo.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4ae950d211cfb17e086e4e3068ff351effb2b5a0
Author: Björn Jacke <b...@sernet.de>
Date:   Fri Oct 30 19:54:52 2009 +0100

    ѕ3:buildsystem: fix depenencies for libreplace
    
    This problem became visible after adding the picky -z defs linker option: On
    Solaris libreplace had unresolved symbols, which showed up in the libtalloc
    build. PAM_WINBIND_EXTRA_LIBS and WINBIND_NSS_EXTRA_LIBS had been 
workarounds
    to make things work at two placeѕ. These variables have been obsoleted now.
    This patch introduces LIBREPLACE_LIBS which contans the linker flags needed 
for
    linking anything using libreplace.

commit 72cec4a03145e11d299a5b679bb4a7ed6818032b
Author: Björn Jacke <b...@sernet.de>
Date:   Fri Oct 30 21:50:41 2009 +0100

    ѕ3:ldap: search for account policies in objectclass sambaDomain, not *

-----------------------------------------------------------------------

Summary of changes:
 source3/Makefile.in       |    7 +++----
 source3/configure.in      |    8 ++++----
 source3/passdb/pdb_ldap.c |    7 ++++++-
 3 files changed, 13 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 748bfd3..3672918 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -72,14 +72,13 @@ nscd_li...@nscd_libs@
 uuid_li...@uuid_libs@
 libwbclie...@libwbclient_static@ @LIBWBCLIENT_SHARED@
 libwbclient_li...@libwbclient_libs@
-winbind_nss_extra_li...@winbind_nss_extra_libs@
 winbind_nss_pthre...@winbind_nss_pthread@
-pam_winbind_extra_li...@pam_winbind_extra_libs@
 dnssd_li...@dnssd_libs@
 avahi_li...@avahi_libs@
 popt_li...@poptlibs@
 libtall...@libtalloc_static@ @LIBTALLOC_SHARED@
 libtalloc_li...@libtalloc_libs@
+libreplace_li...@libreplace_libs@
 libt...@libtdb_static@ @LIBTDB_SHARED@
 libtdb_li...@libtdb_libs@
 libneta...@libnetapi_static@ @LIBNETAPI_SHARED@
@@ -2514,7 +2513,7 @@ bin/v...@exeext@: $(BINARY_PREREQS) $(VLP_OBJ) $(LIBTDB)
 @WINBIND_NSS@: $(BINARY_PREREQS) $(WINBIND_NSS_OBJ)
        @echo "Linking $@"
        @$(SHLD) $(WINBIND_NSS_LDSHFLAGS) -o $@ $(WINBIND_NSS_OBJ) \
-               $(WINBIND_NSS_EXTRA_LIBS) $(WINBIND_NSS_PTHREAD) \
+               $(LIBREPLACE_LIBS) $(WINBIND_NSS_PTHREAD) \
                @sonamef...@`basename $...@`@NSSSONAMEVERSIONSUFFIX@
 
 @WINBIND_WINS_NSS@: $(BINARY_PREREQS) $(WINBIND_WINS_NSS_OBJ) $(LIBTALLOC) 
$(LIBTDB)
@@ -2531,7 +2530,7 @@ bin/winbind_krb5_locat...@shlibext@: $(BINARY_PREREQS) 
$(WINBIND_KRB5_LOCATOR_OB
 bin/pam_winbi...@shlibext@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ) $(LIBTALLOC) 
$(LIBWBCLIENT)
        @echo "Linking shared library $@"
        @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_OBJ) -lpam @INIPARSERLIBS@ \
-               $(PAM_WINBIND_EXTRA_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) 
@sonamef...@`basename $...@`
+               $(LIBREPLACE_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) 
@sonamef...@`basename $...@`
 
 ##########
 # Plugins:
diff --git a/source3/configure.in b/source3/configure.in
index 4a54e66..76ef151 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -696,6 +696,10 @@ LIBREPLACE_DIR=`echo ${libreplacedir} | sed -e 
"s;${srcdir};;" -e "s;^/;;"`
 LIBREPLACE_OBJS="${LIBREPLACEOBJ}"
 AC_SUBST(LIBREPLACE_OBJS)
 
+LIBREPLACE_LIBS="${LIBREPLACE_NETWORK_LIBS}"
+AC_SUBST(LIBREPLACE_LIBS)
+
+
 # add -ldl to the global LIBS
 LIBS="${LIBS} ${LIBDL} ${LIBREPLACE_NETWORK_LIBS}"
 AUTH_LIBS="${AUTH_LIBS} ${CRYPT_LIBS}"
@@ -5956,8 +5960,6 @@ case "$host_os" in
                NSSSONAMEVERSIONSUFFIX=".1"
                WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_solaris.o \
                    ../nsswitch/winbind_nss_linux.o"
-               WINBIND_NSS_EXTRA_LIBS="${LIBREPLACE_NETWORK_LIBS}"
-               PAM_WINBIND_EXTRA_LIBS="${LIBREPLACE_NETWORK_LIBS}"
                ;;
        *hpux11*)
                WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_solaris.o"
@@ -6065,9 +6067,7 @@ AC_SUBST(WINBIND_NSS)
 AC_SUBST(WINBIND_WINS_NSS)
 AC_SUBST(WINBIND_NSS_LDSHFLAGS)
 AC_SUBST(WINBIND_NSS_EXTRA_OBJS)
-AC_SUBST(WINBIND_NSS_EXTRA_LIBS)
 AC_SUBST(NSSSONAMEVERSIONSUFFIX)
-AC_SUBST(PAM_WINBIND_EXTRA_LIBS)
 
 AC_SUBST(WINBIND_KRB5_LOCATOR)
 
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index c464a88..54cb03d 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -3864,6 +3864,7 @@ static NTSTATUS 
ldapsam_get_account_policy_from_ldap(struct pdb_methods *methods
        int count;
        int rc;
        char **vals = NULL;
+       char *filter;
        const char *policy_attr = NULL;
 
        struct ldapsam_privates *ldap_state =
@@ -3887,8 +3888,12 @@ static NTSTATUS 
ldapsam_get_account_policy_from_ldap(struct pdb_methods *methods
        attrs[0] = policy_attr;
        attrs[1] = NULL;
 
+       filter = talloc_asprintf(NULL, "(objectClass=%s)", LDAP_OBJ_DOMINFO);
+       if (filter == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
        rc = smbldap_search(ldap_state->smbldap_state, ldap_state->domain_dn,
-                           LDAP_SCOPE_BASE, "(objectclass=*)", attrs, 0,
+                           LDAP_SCOPE_BASE, filter, attrs, 0,
                            &result);
 
        if (rc != LDAP_SUCCESS) {


-- 
Samba Shared Repository