summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndriy Syrovenko <andriys@gmail.com>2012-05-26 23:41:16 +0300
committerAndrew Bartlett <abartlet@samba.org>2012-05-27 13:15:56 +1000
commitc85f33458fff24c472ad440de3bbc15ee8f94f53 (patch)
tree05f4ddf5780c368f7b2ac68301f1f8e7d9d0e370
parent6634360ce55a84319f197be44d47fc4f4c3ef4d5 (diff)
downloadsamba-c85f33458fff24c472ad440de3bbc15ee8f94f53.tar.gz
samba-c85f33458fff24c472ad440de3bbc15ee8f94f53.tar.bz2
samba-c85f33458fff24c472ad440de3bbc15ee8f94f53.zip
Eliminate dependency on an external uuid library.
-rw-r--r--lib/addns/dns.h4
-rw-r--r--lib/addns/dnsutils.c20
-rw-r--r--lib/addns/wscript3
-rwxr-xr-xlib/addns/wscript_build2
-rwxr-xr-xsource3/wscript6
5 files changed, 11 insertions, 24 deletions
diff --git a/lib/addns/dns.h b/lib/addns/dns.h
index 2864bdf539..c0820fe0bd 100644
--- a/lib/addns/dns.h
+++ b/lib/addns/dns.h
@@ -42,10 +42,6 @@
#include <time.h>
#include <netdb.h>
-#ifdef HAVE_UUID_UUID_H
-#include <uuid/uuid.h>
-#endif
-
#include <talloc.h>
/*******************************************************************
diff --git a/lib/addns/dnsutils.c b/lib/addns/dnsutils.c
index 5a63c61f14..3eeb6ab9e2 100644
--- a/lib/addns/dnsutils.c
+++ b/lib/addns/dnsutils.c
@@ -22,12 +22,13 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "includes.h"
+#include "librpc/ndr/libndr.h"
+#include "librpc/gen_ndr/ndr_misc.h"
+
#include "dns.h"
#include <ctype.h>
-#ifdef HAVE_SYS_UUID_H
-#include <sys/uuid.h>
-#endif
static DNS_ERROR LabelList( TALLOC_CTX *mem_ctx,
const char *name,
@@ -137,17 +138,10 @@ char *dns_generate_keyname( TALLOC_CTX *mem_ctx )
char *result = NULL;
#if defined(WITH_DNS_UPDATES)
- uuid_t uuid;
-
- /*
- * uuid_unparse gives 36 bytes plus '\0'
- */
- if (!(result = talloc_array(mem_ctx, char, 37))) {
- return NULL;
- }
+ struct GUID guid;
- uuid_generate( uuid );
- uuid_unparse( uuid, result );
+ guid = GUID_random();
+ result = GUID_string(mem_ctx, &guid);
#endif
diff --git a/lib/addns/wscript b/lib/addns/wscript
index 99e9358a3d..83945bc1b4 100644
--- a/lib/addns/wscript
+++ b/lib/addns/wscript
@@ -3,4 +3,5 @@
import Options
def configure(conf):
- conf.CHECK_HEADERS('sys/uuid.h')
+ pass
+ #conf.CHECK_HEADERS('sys/uuid.h')
diff --git a/lib/addns/wscript_build b/lib/addns/wscript_build
index 513060d2f0..5fac61c50f 100755
--- a/lib/addns/wscript_build
+++ b/lib/addns/wscript_build
@@ -2,6 +2,6 @@
bld.SAMBA_LIBRARY('addns',
source='dnsquery.c dnsrecord.c dnsutils.c dnssock.c dnsgss.c dnsmarshall.c error.c',
- public_deps='dnshostsfile samba-util gssapi uuid resolv',
+ public_deps='dnshostsfile samba-util gssapi ndr resolv',
private_library=True,
vars=locals())
diff --git a/source3/wscript b/source3/wscript
index 0b36b22e61..6aa4c97c49 100755
--- a/source3/wscript
+++ b/source3/wscript
@@ -785,11 +785,7 @@ int i; i = PAM_RADIO_TYPE;
mandatory=True,
msg="Checking whether setuidx is available")
if Options.options.with_dnsupdate:
- conf.CHECK_HEADERS('uuid/uuid.h')
- conf.CHECK_FUNCS_IN('uuid_generate', 'uuid')
- if not conf.CONFIG_SET('HAVE_UUID_UUID_H') and not conf.CONFIG_SET('HAVE_UUID_GENERATE'):
- Logs.warn("--with-dnsupdate=yes but uuid support not sufficient")
- elif not conf.CONFIG_SET('HAVE_KRB5'):
+ if not conf.CONFIG_SET('HAVE_KRB5'):
Logs.warn("--with-dnsupdate=yes but gssapi support not sufficient")
else:
conf.DEFINE('WITH_DNS_UPDATES', 1)