[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  3278554... s3: Make talloc_attrs() static
      from  dfc84ec... s3: Remove procid_self() from srv_spoolss_reply[open|close]printer()

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


- Log -----------------------------------------------------------------
commit 3278554b3e8864bc412926b67faf8a924a4416c7
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Jul 5 12:36:19 2010 +0200

    s3: Make talloc_attrs() static

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

Summary of changes:
 source3/include/proto.h   |    1 -
 source3/passdb/pdb_ldap.c |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 2374c26..a74373f 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4534,7 +4534,6 @@ int ldapsam_search_suffix_by_name(struct ldapsam_privates *ldap_state,
 					  const char *user,
 					  LDAPMessage ** result,
 					  const char **attr);
-const char **talloc_attrs(TALLOC_CTX *mem_ctx, ...);
 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);
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index d2b4f4f..6ac8f0d 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -4346,7 +4346,7 @@ static char *get_ldap_filter(TALLOC_CTX *mem_ctx, const char *username)
 	return result;
 }
 
-const char **talloc_attrs(TALLOC_CTX *mem_ctx, ...)
+static const char **talloc_attrs(TALLOC_CTX *mem_ctx, ...)
 {
 	int i, num = 0;
 	va_list ap;


-- 
Samba Shared Repository