svn commit: samba r21217 - in branches: SAMBA_3_0/source/libaddns
SAMBA_3_0_25/source/libaddns
vlendec at samba.org
vlendec at samba.org
Wed Feb 7 11:26:37 GMT 2007
Author: vlendec
Date: 2007-02-07 11:26:36 +0000 (Wed, 07 Feb 2007)
New Revision: 21217
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21217
Log:
Just found a system that does not define in_addr_t but only struct
in_addr. Okay, it's a SuSE 7.0, but if the fix is so simple I think we should
not drop that :-)
Volker
Modified:
branches/SAMBA_3_0/source/libaddns/dns.h
branches/SAMBA_3_0/source/libaddns/dnsrecord.c
branches/SAMBA_3_0_25/source/libaddns/dns.h
branches/SAMBA_3_0_25/source/libaddns/dnsrecord.c
Changeset:
Modified: branches/SAMBA_3_0/source/libaddns/dns.h
===================================================================
--- branches/SAMBA_3_0/source/libaddns/dns.h 2007-02-07 07:11:20 UTC (rev 21216)
+++ branches/SAMBA_3_0/source/libaddns/dns.h 2007-02-07 11:26:36 UTC (rev 21217)
@@ -405,13 +405,16 @@
struct dns_rrec **prec);
DNS_ERROR dns_create_name_in_use_record(TALLOC_CTX *mem_ctx,
const char *name,
- const in_addr_t *ip,
+ const struct in_addr *ip,
struct dns_rrec **prec);
DNS_ERROR dns_create_delete_record(TALLOC_CTX *mem_ctx, const char *name,
uint16 type, uint16 r_class,
struct dns_rrec **prec);
+DNS_ERROR dns_create_name_not_in_use_record(TALLOC_CTX *mem_ctx,
+ const char *name, uint32 type,
+ struct dns_rrec **prec);
DNS_ERROR dns_create_a_record(TALLOC_CTX *mem_ctx, const char *host,
- uint32 ttl, in_addr_t ip,
+ uint32 ttl, struct in_addr ip,
struct dns_rrec **prec);
DNS_ERROR dns_unmarshall_tkey_record(TALLOC_CTX *mem_ctx, struct dns_rrec *rec,
struct dns_tkey_record **ptkey);
Modified: branches/SAMBA_3_0/source/libaddns/dnsrecord.c
===================================================================
--- branches/SAMBA_3_0/source/libaddns/dnsrecord.c 2007-02-07 07:11:20 UTC (rev 21216)
+++ branches/SAMBA_3_0/source/libaddns/dnsrecord.c 2007-02-07 11:26:36 UTC (rev 21217)
@@ -121,19 +121,19 @@
}
DNS_ERROR dns_create_a_record(TALLOC_CTX *mem_ctx, const char *host,
- uint32 ttl, in_addr_t ip,
+ uint32 ttl, struct in_addr ip,
struct dns_rrec **prec)
{
uint8 *data;
DNS_ERROR err;
- if (!(data = (uint8 *)TALLOC_MEMDUP(mem_ctx, (const void *)&ip,
- sizeof(ip)))) {
+ if (!(data = (uint8 *)TALLOC_MEMDUP(mem_ctx, (const void *)&ip.s_addr,
+ sizeof(ip.s_addr)))) {
return ERROR_DNS_NO_MEMORY;
}
err = dns_create_rrec(mem_ctx, host, QTYPE_A, DNS_CLASS_IN, ttl,
- sizeof(ip), data, prec);
+ sizeof(ip.s_addr), data, prec);
if (!ERR_DNS_IS_OK(err)) {
TALLOC_FREE(data);
@@ -144,7 +144,7 @@
DNS_ERROR dns_create_name_in_use_record(TALLOC_CTX *mem_ctx,
const char *name,
- const in_addr_t *ip,
+ const struct in_addr *ip,
struct dns_rrec **prec)
{
if (ip != NULL) {
@@ -338,7 +338,7 @@
for (i=0; i<num_ips; i++) {
err = dns_create_name_in_use_record(req, host,
- &iplist[i].s_addr, &rec);
+ &iplist[i], &rec);
if (!ERR_DNS_IS_OK(err)) goto error;
err = dns_add_rrec(req, rec, &req->num_preqs, &req->preqs);
@@ -395,7 +395,7 @@
*/
for ( i=0; i<num_addrs; i++ ) {
- err = dns_create_a_record(req, hostname, 3600, ip_addrs[i].s_addr, &rec);
+ err = dns_create_a_record(req, hostname, 3600, ip_addrs[i], &rec);
if (!ERR_DNS_IS_OK(err))
goto error;
Modified: branches/SAMBA_3_0_25/source/libaddns/dns.h
===================================================================
--- branches/SAMBA_3_0_25/source/libaddns/dns.h 2007-02-07 07:11:20 UTC (rev 21216)
+++ branches/SAMBA_3_0_25/source/libaddns/dns.h 2007-02-07 11:26:36 UTC (rev 21217)
@@ -405,13 +405,16 @@
struct dns_rrec **prec);
DNS_ERROR dns_create_name_in_use_record(TALLOC_CTX *mem_ctx,
const char *name,
- const in_addr_t *ip,
+ const struct in_addr *ip,
struct dns_rrec **prec);
DNS_ERROR dns_create_delete_record(TALLOC_CTX *mem_ctx, const char *name,
uint16 type, uint16 r_class,
struct dns_rrec **prec);
+DNS_ERROR dns_create_name_not_in_use_record(TALLOC_CTX *mem_ctx,
+ const char *name, uint32 type,
+ struct dns_rrec **prec);
DNS_ERROR dns_create_a_record(TALLOC_CTX *mem_ctx, const char *host,
- uint32 ttl, in_addr_t ip,
+ uint32 ttl, struct in_addr ip,
struct dns_rrec **prec);
DNS_ERROR dns_unmarshall_tkey_record(TALLOC_CTX *mem_ctx, struct dns_rrec *rec,
struct dns_tkey_record **ptkey);
Modified: branches/SAMBA_3_0_25/source/libaddns/dnsrecord.c
===================================================================
--- branches/SAMBA_3_0_25/source/libaddns/dnsrecord.c 2007-02-07 07:11:20 UTC (rev 21216)
+++ branches/SAMBA_3_0_25/source/libaddns/dnsrecord.c 2007-02-07 11:26:36 UTC (rev 21217)
@@ -121,19 +121,19 @@
}
DNS_ERROR dns_create_a_record(TALLOC_CTX *mem_ctx, const char *host,
- uint32 ttl, in_addr_t ip,
+ uint32 ttl, struct in_addr ip,
struct dns_rrec **prec)
{
uint8 *data;
DNS_ERROR err;
- if (!(data = (uint8 *)TALLOC_MEMDUP(mem_ctx, (const void *)&ip,
- sizeof(ip)))) {
+ if (!(data = (uint8 *)TALLOC_MEMDUP(mem_ctx, (const void *)&ip.s_addr,
+ sizeof(ip.s_addr)))) {
return ERROR_DNS_NO_MEMORY;
}
err = dns_create_rrec(mem_ctx, host, QTYPE_A, DNS_CLASS_IN, ttl,
- sizeof(ip), data, prec);
+ sizeof(ip.s_addr), data, prec);
if (!ERR_DNS_IS_OK(err)) {
TALLOC_FREE(data);
@@ -144,7 +144,7 @@
DNS_ERROR dns_create_name_in_use_record(TALLOC_CTX *mem_ctx,
const char *name,
- const in_addr_t *ip,
+ const struct in_addr *ip,
struct dns_rrec **prec)
{
if (ip != NULL) {
@@ -338,7 +338,7 @@
for (i=0; i<num_ips; i++) {
err = dns_create_name_in_use_record(req, host,
- &iplist[i].s_addr, &rec);
+ &iplist[i], &rec);
if (!ERR_DNS_IS_OK(err)) goto error;
err = dns_add_rrec(req, rec, &req->num_preqs, &req->preqs);
@@ -395,7 +395,7 @@
*/
for ( i=0; i<num_addrs; i++ ) {
- err = dns_create_a_record(req, hostname, 3600, ip_addrs[i].s_addr, &rec);
+ err = dns_create_a_record(req, hostname, 3600, ip_addrs[i], &rec);
if (!ERR_DNS_IS_OK(err))
goto error;
More information about the samba-cvs
mailing list