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

[Michael Adam]

The branch, v3-3-test has been updated
       via  0fba9549894affa8e2ea0b7fd15812f56f3319a3 (commit)
       via  32df05bd1f49f2290ad69f84d5a47207b1469629 (commit)
      from  13b1a232d2fe05ae3e924ea2503d05ff5084146e (commit)

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


- Log -----------------------------------------------------------------
commit 0fba9549894affa8e2ea0b7fd15812f56f3319a3
Author: Michael Adam <obnox at samba.org>
Date:   Fri Aug 8 23:30:19 2008 +0200

    build: fix a no previous prototype warning when building without ldap/gssapia
    
    move prototype of dns_create_update_request() to appropriate section in dns.h
    
    Michael

commit 32df05bd1f49f2290ad69f84d5a47207b1469629
Author: Michael Adam <obnox at samba.org>
Date:   Fri Aug 8 23:03:51 2008 +0200

    libnet samsync ldif: fix the build without LDAP.
    
    Michael

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

Summary of changes:
 source/libaddns/dns.h               |   12 ++++++------
 source/libnet/libnet_samsync_ldif.c |   15 +++++++++++++++
 2 files changed, 21 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libaddns/dns.h b/source/libaddns/dns.h
index cf842f4..2eaeaf7 100644
--- a/source/libaddns/dns.h
+++ b/source/libaddns/dns.h
@@ -456,6 +456,12 @@ DNS_ERROR dns_create_tsig_record(TALLOC_CTX *mem_ctx, const char *keyname,
 				 struct dns_rrec **prec);
 DNS_ERROR dns_add_rrec(TALLOC_CTX *mem_ctx, struct dns_rrec *rec,
 		       uint16 *num_records, struct dns_rrec ***records);
+DNS_ERROR dns_create_update_request(TALLOC_CTX *mem_ctx,
+				    const char *domainname,
+				    const char *hostname,
+				    const struct sockaddr_storage *ip_addr,
+				    size_t num_adds,
+				    struct dns_update_request **preq);
 
 /* from dnssock.c */
 
@@ -523,12 +529,6 @@ DNS_ERROR dns_sign_update(struct dns_update_request *req,
 			  const char *keyname,
 			  const char *algorithmname,
 			  time_t time_signed, uint16 fudge);
-DNS_ERROR dns_create_update_request(TALLOC_CTX *mem_ctx,
-				    const char *domainname,
-				    const char *hostname,
-				    const struct sockaddr_storage *ip_addr,
-				    size_t num_adds,
-				    struct dns_update_request **preq);
 
 #endif	/* HAVE_GSSAPI_SUPPORT */
 
diff --git a/source/libnet/libnet_samsync_ldif.c b/source/libnet/libnet_samsync_ldif.c
index adcf928..cbae22a 100644
--- a/source/libnet/libnet_samsync_ldif.c
+++ b/source/libnet/libnet_samsync_ldif.c
@@ -26,6 +26,8 @@
 #include "includes.h"
 #include "libnet/libnet_samsync.h"
 
+#ifdef HAVE_LDAP
+
 /* uid's and gid's for writing deltas to ldif */
 static uint32 ldif_gid = 999;
 static uint32 ldif_uid = 999;
@@ -1212,3 +1214,16 @@ NTSTATUS fetch_sam_entries_ldif(TALLOC_CTX *mem_ctx,
 
 	return status;
 }
+
+#else /* HAVE_LDAP */
+
+NTSTATUS fetch_sam_entries_ldif(TALLOC_CTX *mem_ctx,
+				enum netr_SamDatabaseID database_id,
+				struct netr_DELTA_ENUM_ARRAY *r,
+				bool last_query,
+				struct samsync_context *ctx)
+{
+	return NT_STATUS_NOT_SUPPORTED;
+}
+
+#endif


-- 
Samba Shared Repository