summaryrefslogtreecommitdiff
path: root/source3/passdb
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-09-19 00:12:11 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:52:19 -0500
commit4e7d11449ad419f4fa791e26e059a9f73d6d4042 (patch)
treea826e6e5634ae9c3174c5ae3620adfe6dfb03749 /source3/passdb
parentbc82f70e0b66c55ca90c7dec490de478812151c2 (diff)
downloadsamba-4e7d11449ad419f4fa791e26e059a9f73d6d4042.tar.gz
samba-4e7d11449ad419f4fa791e26e059a9f73d6d4042.tar.bz2
samba-4e7d11449ad419f4fa791e26e059a9f73d6d4042.zip
r18654: Rename "struct uuid" => "struct GUID" for consistency.
(This used to be commit 5de76767e857e9d159ea46e2ded612ccd6d6bf19)
Diffstat (limited to 'source3/passdb')
-rw-r--r--source3/passdb/secrets.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c
index f72a7cb8d5..a1be400c46 100644
--- a/source3/passdb/secrets.c
+++ b/source3/passdb/secrets.c
@@ -158,39 +158,39 @@ BOOL secrets_fetch_domain_sid(const char *domain, DOM_SID *sid)
return True;
}
-BOOL secrets_store_domain_guid(const char *domain, struct uuid *guid)
+BOOL secrets_store_domain_guid(const char *domain, struct GUID *guid)
{
fstring key;
slprintf(key, sizeof(key)-1, "%s/%s", SECRETS_DOMAIN_GUID, domain);
strupper_m(key);
- return secrets_store(key, guid, sizeof(struct uuid));
+ return secrets_store(key, guid, sizeof(struct GUID));
}
-BOOL secrets_fetch_domain_guid(const char *domain, struct uuid *guid)
+BOOL secrets_fetch_domain_guid(const char *domain, struct GUID *guid)
{
- struct uuid *dyn_guid;
+ struct GUID *dyn_guid;
fstring key;
size_t size = 0;
- struct uuid new_guid;
+ struct GUID new_guid;
slprintf(key, sizeof(key)-1, "%s/%s", SECRETS_DOMAIN_GUID, domain);
strupper_m(key);
- dyn_guid = (struct uuid *)secrets_fetch(key, &size);
+ dyn_guid = (struct GUID *)secrets_fetch(key, &size);
if (!dyn_guid) {
if (lp_server_role() == ROLE_DOMAIN_PDC) {
smb_uuid_generate_random(&new_guid);
if (!secrets_store_domain_guid(domain, &new_guid))
return False;
- dyn_guid = (struct uuid *)secrets_fetch(key, &size);
+ dyn_guid = (struct GUID *)secrets_fetch(key, &size);
}
if (dyn_guid == NULL) {
return False;
}
}
- if (size != sizeof(struct uuid)) {
+ if (size != sizeof(struct GUID)) {
DEBUG(1,("UUID size %d is wrong!\n", (int)size));
SAFE_FREE(dyn_guid);
return False;