diff options
| author | Tim Potter <tpot@samba.org> | 2003-06-13 04:35:53 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2003-06-13 04:35:53 +0000 |
| commit | 0a9396dcca1e30fa32fbcde3ee2dce86f586ba4b (patch) | |
| tree | 7ccac6f82746bf5410dbe25f69aebfe949995cf4 | |
| parent | 61742d1117e12cbb131f9c55ab0a9acbcc1f4d3a (diff) | |
| download | samba-0a9396dcca1e30fa32fbcde3ee2dce86f586ba4b.tar.gz samba-0a9396dcca1e30fa32fbcde3ee2dce86f586ba4b.tar.bz2 samba-0a9396dcca1e30fa32fbcde3ee2dce86f586ba4b.zip | |
Rename some uuid functions so as not to conflict with system
versions. Fixes bug #154.
(This used to be commit 986eae40f7669d15dc75aed340e628aa7efafddc)
| -rw-r--r-- | source3/lib/util_uuid.c | 6 | ||||
| -rw-r--r-- | source3/libads/ldap.c | 2 | ||||
| -rw-r--r-- | source3/passdb/secrets.c | 2 | ||||
| -rw-r--r-- | source3/rpc_server/srv_spoolss_nt.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/source3/lib/util_uuid.c b/source3/lib/util_uuid.c index 699f2cd632..83553ec28e 100644 --- a/source3/lib/util_uuid.c +++ b/source3/lib/util_uuid.c @@ -58,7 +58,7 @@ static void uuid_unpack(const GUID in, struct uuid *uu) memcpy(uu->node, ptr+10, 6); } -void uuid_generate_random(GUID *out) +void smb_uuid_generate_random(GUID *out) { GUID tmp; struct uuid uu; @@ -71,7 +71,7 @@ void uuid_generate_random(GUID *out) uuid_pack(&uu, out); } -char *guid_to_string(const GUID in) +char *smb_uuid_to_string(const GUID in) { struct uuid uu; char *out; @@ -87,7 +87,7 @@ char *guid_to_string(const GUID in) return out; } -const char *uuid_string_static(const GUID in) +const char *smb_uuid_string_static(const GUID in) { struct uuid uu; static char out[37]; diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c index 3ce80975da..c685ed53ab 100644 --- a/source3/libads/ldap.c +++ b/source3/libads/ldap.c @@ -1142,7 +1142,7 @@ static void dump_guid(const char *field, struct berval **values) GUID guid; for (i=0; values[i]; i++) { memcpy(guid.info, values[i]->bv_val, sizeof(guid.info)); - printf("%s: %s\n", field, uuid_string_static(guid)); + printf("%s: %s\n", field, smb_uuid_string_static(guid)); } } diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c index 5df0edc29a..bd4f559f9f 100644 --- a/source3/passdb/secrets.c +++ b/source3/passdb/secrets.c @@ -151,7 +151,7 @@ BOOL secrets_fetch_domain_guid(const char *domain, GUID *guid) DEBUG(6,("key is %s, size is %d\n", key, (int)size)); if ((NULL == dyn_guid) && (ROLE_DOMAIN_PDC == lp_server_role())) { - uuid_generate_random(&new_guid); + smb_uuid_generate_random(&new_guid); if (!secrets_store_domain_guid(domain, &new_guid)) return False; dyn_guid = (GUID *)secrets_fetch(key, &size); diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index 92b1481ab8..217d2cbaea 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -4330,7 +4330,7 @@ static BOOL construct_printer_info_7(Printer_entry *print_hnd, PRINTER_INFO_7 *p GUID guid; if (is_printer_published(print_hnd, snum, &guid)) { - asprintf(&guid_str, "{%s}", uuid_string_static(guid)); + asprintf(&guid_str, "{%s}", smb_uuid_string_static(guid)); strupper(guid_str); init_unistr(&printer->guid, guid_str); printer->action = SPOOL_DS_PUBLISH; |