[SCM] Samba Shared Repository - branch master updated

[Alexander Bokovoy]

The branch, master has been updated
       via  45f8f97 lib/krb5_wrap: when deleting default realm, pass char*, not char**
       via  d55980c s3-pdb: filter out more symbols only used in ldapsam internals
      from  34bd3cb WHATSNEW: provision and updateprovision have new names

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


- Log -----------------------------------------------------------------
commit 45f8f979378c521c0b9e6df606cfe3558f6ee7b1
Author: Alexander Bokovoy <ab at samba.org>
Date:   Tue Sep 11 20:12:42 2012 +0300

    lib/krb5_wrap: when deleting default realm, pass char*, not char**
    
    Autobuild-User(master): Alexander Bokovoy <ab at samba.org>
    Autobuild-Date(master): Wed Sep 12 10:33:37 CEST 2012 on sn-devel-104

commit d55980ccad2fec5d88fceb5eef9df8df647f4e9f
Author: Alexander Bokovoy <ab at samba.org>
Date:   Tue Sep 11 12:29:49 2012 +0300

    s3-pdb: filter out more symbols only used in ldapsam internals

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

Summary of changes:
 lib/krb5_wrap/krb5_samba.c    |    2 +-
 source3/passdb/ABI/pdb-0.sigs |    1 -
 source3/wscript_build         |    2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
index 2d237ff..1a5a710 100644
--- a/lib/krb5_wrap/krb5_samba.c
+++ b/lib/krb5_wrap/krb5_samba.c
@@ -2001,7 +2001,7 @@ krb5_error_code smb_krb5_make_principal(krb5_context context,
 	va_end(ap);
 
 	if (free_realm) {
-		krb5_free_default_realm(context, &realm);
+		krb5_free_default_realm(context, realm);
 	}
 
 	return code;
diff --git a/source3/passdb/ABI/pdb-0.sigs b/source3/passdb/ABI/pdb-0.sigs
index 2bccc08..2b57301 100644
--- a/source3/passdb/ABI/pdb-0.sigs
+++ b/source3/passdb/ABI/pdb-0.sigs
@@ -35,7 +35,6 @@ get_privileges_for_sid_as_set: NTSTATUS (TALLOC_CTX *, PRIVILEGE_SET **, struct
 get_privileges_for_sids: bool (uint64_t *, struct dom_sid *, int)
 get_trust_pw_clear: bool (const char *, char **, const char **, enum netr_SchannelType *)
 get_trust_pw_hash: bool (const char *, uint8_t *, const char **, enum netr_SchannelType *)
-get_userattr_list: const char **(TALLOC_CTX *, int)
 gid_to_sid: void (struct dom_sid *, gid_t)
 gid_to_unix_groups_sid: void (gid_t, struct dom_sid *)
 grab_named_mutex: struct named_mutex *(TALLOC_CTX *, const char *, int)
diff --git a/source3/wscript_build b/source3/wscript_build
index 2903594..c7395e7 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -711,7 +711,7 @@ private_pdb_match.append('!idmap_xids_to_sids')
 
 # ldap module is actually three modules merged together: ldapsam, ipa, and nds
 static_pdb_match = static_pdb_match + ['ldap', 'ipa', 'nds']
-ldapsam_pdb_match = ['!priv2ld', '!smbldap_search_domain_info', '!ldapsam_*', '!groupmap_attr_list*']
+ldapsam_pdb_match = ['!priv2ld', '!smbldap_search_domain_info', '!ldapsam_*', '!groupmap_attr_list*', '!get_userattr_list']
 private_pdb_match.append('!pdb_nds_*')
 private_pdb_match.append('!pdb_init_ldapsam')
 private_pdb_match = private_pdb_match + ldapsam_pdb_match


-- 
Samba Shared Repository