diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2012-03-18 18:46:18 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2012-03-20 13:54:07 +0100 |
| commit | d875327b10ca0fd3d548b4e9088ffcc7ef421baf (patch) | |
| tree | 3ab01460e8ee9739897938550bc2bcc6d13fcc63 /librpc | |
| parent | 0b6dea9d664841d505acd75ac5449e953f60db74 (diff) | |
| download | samba-d875327b10ca0fd3d548b4e9088ffcc7ef421baf.tar.gz samba-d875327b10ca0fd3d548b4e9088ffcc7ef421baf.tar.bz2 samba-d875327b10ca0fd3d548b4e9088ffcc7ef421baf.zip | |
Move NS_GUID_string and NS_GUID_from_string to dsdb-common.
Diffstat (limited to 'librpc')
| -rw-r--r-- | librpc/ndr/libndr.h | 2 | ||||
| -rw-r--r-- | librpc/ndr/uuid.c | 52 |
2 files changed, 0 insertions, 54 deletions
diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h index 1a4d2a1fbc..37a3145e12 100644 --- a/librpc/ndr/libndr.h +++ b/librpc/ndr/libndr.h @@ -608,14 +608,12 @@ NTSTATUS GUID_to_ndr_blob(const struct GUID *guid, TALLOC_CTX *mem_ctx, DATA_BLO NTSTATUS GUID_from_ndr_blob(const DATA_BLOB *b, struct GUID *guid); NTSTATUS GUID_from_data_blob(const DATA_BLOB *s, struct GUID *guid); NTSTATUS GUID_from_string(const char *s, struct GUID *guid); -NTSTATUS NS_GUID_from_string(const char *s, struct GUID *guid); struct GUID GUID_zero(void); bool GUID_all_zero(const struct GUID *u); int GUID_compare(const struct GUID *u1, const struct GUID *u2); char *GUID_string(TALLOC_CTX *mem_ctx, const struct GUID *guid); char *GUID_string2(TALLOC_CTX *mem_ctx, const struct GUID *guid); char *GUID_hexstring(TALLOC_CTX *mem_ctx, const struct GUID *guid); -char *NS_GUID_string(TALLOC_CTX *mem_ctx, const struct GUID *guid); struct GUID GUID_random(void); _PUBLIC_ enum ndr_err_code ndr_pull_enum_uint8(struct ndr_pull *ndr, int ndr_flags, uint8_t *v); diff --git a/librpc/ndr/uuid.c b/librpc/ndr/uuid.c index b1436f73cb..cefe7b65d4 100644 --- a/librpc/ndr/uuid.c +++ b/librpc/ndr/uuid.c @@ -157,45 +157,6 @@ _PUBLIC_ NTSTATUS GUID_from_string(const char *s, struct GUID *guid) } /** - build a GUID from a string -*/ -_PUBLIC_ NTSTATUS NS_GUID_from_string(const char *s, struct GUID *guid) -{ - NTSTATUS status = NT_STATUS_INVALID_PARAMETER; - uint32_t time_low; - uint32_t time_mid, time_hi_and_version; - uint32_t clock_seq[2]; - uint32_t node[6]; - int i; - - if (s == NULL) { - return NT_STATUS_INVALID_PARAMETER; - } - - if (11 == sscanf(s, "%08x-%04x%04x-%02x%02x%02x%02x-%02x%02x%02x%02x", - &time_low, &time_mid, &time_hi_and_version, - &clock_seq[0], &clock_seq[1], - &node[0], &node[1], &node[2], &node[3], &node[4], &node[5])) { - status = NT_STATUS_OK; - } - - if (!NT_STATUS_IS_OK(status)) { - return status; - } - - guid->time_low = time_low; - guid->time_mid = time_mid; - guid->time_hi_and_version = time_hi_and_version; - guid->clock_seq[0] = clock_seq[0]; - guid->clock_seq[1] = clock_seq[1]; - for (i=0;i<6;i++) { - guid->node[i] = node[i]; - } - - return NT_STATUS_OK; -} - -/** * generate a random GUID */ _PUBLIC_ struct GUID GUID_random(void) @@ -318,19 +279,6 @@ _PUBLIC_ char *GUID_hexstring(TALLOC_CTX *mem_ctx, const struct GUID *guid) return ret; } -_PUBLIC_ char *NS_GUID_string(TALLOC_CTX *mem_ctx, const struct GUID *guid) -{ - return talloc_asprintf(mem_ctx, - "%08x-%04x%04x-%02x%02x%02x%02x-%02x%02x%02x%02x", - guid->time_low, guid->time_mid, - guid->time_hi_and_version, - guid->clock_seq[0], - guid->clock_seq[1], - guid->node[0], guid->node[1], - guid->node[2], guid->node[3], - guid->node[4], guid->node[5]); -} - _PUBLIC_ bool ndr_policy_handle_empty(const struct policy_handle *h) { return (h->handle_type == 0 && GUID_all_zero(&h->uuid)); |