[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  8853bab s3-build: try to fix the non-ldap build.
       via  ccbcffa libcli/ldap Add const to ldap_encode_ndr_dom_sid()
      from  4752a6b s4-test: yet another test for ATTID-ot-OID conversion

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


- Log -----------------------------------------------------------------
commit 8853babb504298bd87fb5cae2120f2be63b08312
Author: Günther Deschner <gd at samba.org>
Date:   Mon Sep 20 15:03:56 2010 -0700

    s3-build: try to fix the non-ldap build.
    
    ldapsam_search_suffix_by_name is already prototyped in smbldap.h.
    
    Guenther

commit ccbcffadb6e3b8dc6951e7d80e65a06eb5df61de
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Sep 17 11:15:28 2010 +1000

    libcli/ldap Add const to ldap_encode_ndr_dom_sid()
    
    Signed-off-by: Günther Deschner <gd at samba.org>

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

Summary of changes:
 libcli/ldap/ldap_ndr.c  |    2 +-
 libcli/ldap/ldap_ndr.h  |    2 +-
 source3/include/proto.h |    4 ----
 3 files changed, 2 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/ldap/ldap_ndr.c b/libcli/ldap/ldap_ndr.c
index 3b40fbb..6daaba3 100644
--- a/libcli/ldap/ldap_ndr.c
+++ b/libcli/ldap/ldap_ndr.c
@@ -65,7 +65,7 @@ char *ldap_encode_ndr_dom_sid(TALLOC_CTX *mem_ctx, const struct dom_sid *sid)
 /*
   encode a NDR GUID as a ldap filter element
 */
-char *ldap_encode_ndr_GUID(TALLOC_CTX *mem_ctx, struct GUID *guid)
+char *ldap_encode_ndr_GUID(TALLOC_CTX *mem_ctx, const struct GUID *guid)
 {
 	DATA_BLOB blob;
 	NTSTATUS status;
diff --git a/libcli/ldap/ldap_ndr.h b/libcli/ldap/ldap_ndr.h
index ee1f702..df5ee47 100644
--- a/libcli/ldap/ldap_ndr.h
+++ b/libcli/ldap/ldap_ndr.h
@@ -5,7 +5,7 @@
 
 char *ldap_encode_ndr_uint32(TALLOC_CTX *mem_ctx, uint32_t value);
 char *ldap_encode_ndr_dom_sid(TALLOC_CTX *mem_ctx, const struct dom_sid *sid);
-char *ldap_encode_ndr_GUID(TALLOC_CTX *mem_ctx, struct GUID *guid);
+char *ldap_encode_ndr_GUID(TALLOC_CTX *mem_ctx, const struct GUID *guid);
 NTSTATUS ldap_decode_ndr_GUID(TALLOC_CTX *mem_ctx, struct ldb_val val, struct GUID *guid);
 
 #endif /* __LIBCLI_LDAP_LDAP_NDR_H__ */
diff --git a/source3/include/proto.h b/source3/include/proto.h
index d19cea8..5bb91c5 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -3905,10 +3905,6 @@ NTSTATUS make_pdb_method( struct pdb_methods **methods ) ;
 struct ldapsam_privates;
 
 const char** get_userattr_list( TALLOC_CTX *mem_ctx, int schema_ver );
-int ldapsam_search_suffix_by_name(struct ldapsam_privates *ldap_state,
-					  const char *user,
-					  LDAPMessage ** result,
-					  const char **attr);
 NTSTATUS pdb_init_ldapsam_compat(struct pdb_methods **pdb_method, const char *location);
 NTSTATUS pdb_init_ldapsam(struct pdb_methods **pdb_method, const char *location);
 NTSTATUS pdb_ldap_init(void);


-- 
Samba Shared Repository