Changeset 228 for branches/samba-3.2.x/source/nsswitch/libwbclient

Timestamp:

May 26, 2009, 9:44:50 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

File:

• branches/samba-3.2.x/source/nsswitch/libwbclient/wbc_sid.c (modified) (4 diffs)

branches/samba-3.2.x/source/nsswitch/libwbclient/wbc_sid.c

@@ -41 +41 @@
         int i;
         char *tmp = NULL;
-        TALLOC_CTX *ctx = NULL;
 
         if (!sid) {
@@ -47 +46 @@
                 BAIL_ON_WBC_ERROR(wbc_status);
         }
-
-        ctx = talloc_init("wbcSidToString");
-        BAIL_ON_PTR_ERROR(ctx, wbc_status);
 
         id_auth = sid->id_auth[5] +
@@ -56 +52 @@
                 (sid->id_auth[2] << 24);
 
-        tmp = talloc_asprintf(ctx, "S-%d-%d", sid->sid_rev_num, id_auth);
+        tmp = talloc_asprintf(NULL, "S-%d-%d", sid->sid_rev_num, id_auth);
         BAIL_ON_PTR_ERROR(tmp, wbc_status);
 
@@ -67 +63 @@
         }
 
-        *sid_string=talloc_strdup(NULL, tmp);
-        BAIL_ON_PTR_ERROR((*sid_string), wbc_status);
+        *sid_string = tmp;
+        tmp = NULL;
 
         wbc_status = WBC_ERR_SUCCESS;
 
 done:
-        talloc_free(ctx);
+        talloc_free(tmp);
 
         return wbc_status;