[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  ba0ba4e... s3: Make some routines static in smbldap
      from  4fc51ad... s4:repl_meta_data LDB module - fix counter type

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


- Log -----------------------------------------------------------------
commit ba0ba4e85b6c248cfc8079d6db9b8a22e55f7336
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Jun 28 16:54:56 2010 +0200

    s3: Make some routines static in smbldap

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

Summary of changes:
 source3/include/proto.h |    2 --
 source3/lib/smbldap.c   |    4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 07a6757..a654495 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -818,8 +818,6 @@ bool parse_usershare_acl(TALLOC_CTX *ctx, const char *acl_str, struct security_d
 /* The following definitions come from lib/smbldap.c  */
 
 int smb_ldap_start_tls(LDAP *ldap_struct, int version);
-int smb_ldap_setup_conn(LDAP **ldap_struct, const char *uri);
-int smb_ldap_upgrade_conn(LDAP *ldap_struct, int *new_version) ;
 int smb_ldap_setup_full_conn(LDAP **ldap_struct, const char *uri);
 int smbldap_search(struct smbldap_state *ldap_state, 
 		   const char *base, int scope, const char *filter, 
diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c
index 118f891..a4d26fa 100644
--- a/source3/lib/smbldap.c
+++ b/source3/lib/smbldap.c
@@ -744,7 +744,7 @@ int smb_ldap_start_tls(LDAP *ldap_struct, int version)
  setup a connection to the LDAP server based on a uri
 *******************************************************************/
 
-int smb_ldap_setup_conn(LDAP **ldap_struct, const char *uri)
+static int smb_ldap_setup_conn(LDAP **ldap_struct, const char *uri)
 {
 	int rc;
 
@@ -848,7 +848,7 @@ int smb_ldap_setup_conn(LDAP **ldap_struct, const char *uri)
  version 
  *******************************************************************/
 
-int smb_ldap_upgrade_conn(LDAP *ldap_struct, int *new_version) 
+static int smb_ldap_upgrade_conn(LDAP *ldap_struct, int *new_version)
 {
 	int version;
 	int rc;


-- 
Samba Shared Repository