Changeset 745 for trunk/server/nsswitch/libwbclient/wbc_guid.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• nsswitch/libwbclient/wbc_guid.c (modified) (1 diff)

trunk/server/nsswitch/libwbclient/wbc_guid.c

@@ -30 +30 @@
                        char **guid_string)
 {
-        wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
+        char *result;
 
-        if (!guid) {
-                wbc_status = WBC_ERR_INVALID_PARAM;
-                BAIL_ON_WBC_ERROR(wbc_status);
+        result = (char *)wbcAllocateMemory(37, 1, NULL);
+        if (result == NULL) {
+                return WBC_ERR_NO_MEMORY;
         }
+        snprintf(result, 37,
+                 "%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]);
+        *guid_string = result;
 
-        *guid_string = talloc_asprintf(NULL,
-                                       "%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]);
-        BAIL_ON_PTR_ERROR((*guid_string), wbc_status);
-
-        wbc_status = WBC_ERR_SUCCESS;
-
-done:
-        return wbc_status;
+        return WBC_ERR_SUCCESS;
 }