[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  609a923 dns_server: Fix a clang warning
      from  4749aec s3-build: Avoid setting CTDB specific include path

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


- Log -----------------------------------------------------------------
commit 609a92362e89c9b0a0f35d7488ae788382d893f1
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Nov 9 10:01:59 2015 +0100

    dns_server: Fix a clang warning
    
    clang complains that '\0' is converted to a NULL pointer. This seems
    to work fine, so make this pointer explicitly NULL. If instead we
    need a "" here, we could of course do that too.
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Tue Nov 10 10:13:18 CET 2015 on sn-devel-104

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

Summary of changes:
 source4/dns_server/dns_utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source4/dns_server/dns_utils.c b/source4/dns_server/dns_utils.c
index 3092633..ce450b5 100644
--- a/source4/dns_server/dns_utils.c
+++ b/source4/dns_server/dns_utils.c
@@ -193,7 +193,7 @@ WERROR dns_generate_options(struct dns_server *dns,
 	if (o == NULL) {
 		return WERR_NOMEM;
 	}
-	o->name = '\0';
+	o->name = NULL;
 	o->rr_type = DNS_QTYPE_OPT;
 	/* This is ugly, but RFC2671 wants the payload size in this field */
 	o->rr_class = (enum dns_qclass) dns->max_payload;


-- 
Samba Shared Repository