[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2718-g62fcad0

Günther Deschner gd at samba.org
Tue Jun 3 18:42:46 GMT 2008


The branch, v3-3-test has been updated
       via  62fcad0c0548ab53e9c20cfd6301972c68172b95 (commit)
       via  06b597213a25c3370d3b7e29cf80ddd42fa35e0c (commit)
      from  57d596395db287301eefd34e62c9aaf857c34c69 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 62fcad0c0548ab53e9c20cfd6301972c68172b95
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jun 3 20:41:55 2008 +0200

    build: fix build warning.
    
    Guenther

commit 06b597213a25c3370d3b7e29cf80ddd42fa35e0c
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jun 3 20:41:29 2008 +0200

    build: fix the build (missing protoype for lp_ldap_connection_timeout()).
    
    Guenther

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

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


Changeset truncated at 500 lines:

diff --git a/source/include/proto.h b/source/include/proto.h
index 761c720..e8a2b69 100644
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -5829,6 +5829,7 @@ int lp_ldap_passwd_sync(void);
 bool lp_ldap_delete_dn(void);
 int lp_ldap_replication_sleep(void);
 int lp_ldap_timeout(void);
+int lp_ldap_connection_timeout(void);
 int lp_ldap_page_size(void);
 int lp_ldap_debug_level(void);
 int lp_ldap_debug_threshold(void);
diff --git a/source/lib/smbldap.c b/source/lib/smbldap.c
index c2c58c0..efe3a1b 100644
--- a/source/lib/smbldap.c
+++ b/source/lib/smbldap.c
@@ -694,7 +694,7 @@ int smb_ldap_setup_conn(LDAP **ldap_struct, const char *uri)
 		rc = ldap_set_option(*ldap_struct, LDAP_OPT_NETWORK_TIMEOUT, &ct);
 		if (rc != LDAP_SUCCESS) {
 			DEBUG(0,("Failed to setup an ldap connection timeout %d: %s\n",
-				ct.tv_sec, ldap_err2string(rc)));
+				(int)ct.tv_sec, ldap_err2string(rc)));
 		}
 	}
 #endif


-- 
Samba Shared Repository


More information about the samba-cvs mailing list