diff options
| author | Jeremy Allison <jra@samba.org> | 2008-08-08 14:33:55 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-08-08 14:33:55 -0700 |
| commit | c6930a0b40a95294931888e8749be8cf90f50ac9 (patch) | |
| tree | ea52e0bf88b9404b9497c611733efcbcdb8eeace | |
| parent | e8c7ff3e880c7c7e696c5ba7baa8536b4ea7cb89 (diff) | |
| parent | f698952a39bf4cc735bea31b64fb90e979ec0907 (diff) | |
| download | samba-c6930a0b40a95294931888e8749be8cf90f50ac9.tar.gz samba-c6930a0b40a95294931888e8749be8cf90f50ac9.tar.bz2 samba-c6930a0b40a95294931888e8749be8cf90f50ac9.zip | |
Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test
(This used to be commit 5b3579b14cd5ea6e67ff3c91f5bed155d944c049)
| -rw-r--r-- | source3/libaddns/dns.h | 12 | ||||
| -rw-r--r-- | source3/libnet/libnet_samsync_ldif.c | 15 |
2 files changed, 21 insertions, 6 deletions
diff --git a/source3/libaddns/dns.h b/source3/libaddns/dns.h index cf842f4d10..2eaeaf7608 100644 --- a/source3/libaddns/dns.h +++ b/source3/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/source3/libnet/libnet_samsync_ldif.c b/source3/libnet/libnet_samsync_ldif.c index adcf92832d..cbae22aad3 100644 --- a/source3/libnet/libnet_samsync_ldif.c +++ b/source3/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 |