base64_key = base64_encode_data_blob(key);
if (base64_key == NULL) {
- free(base64_ticket);
+ TALLOC_FREE(base64_ticket);
return NULL;
}
DEBUG(10, ("Got ticket string:\n%s\n", result));
- free(base64_ticket);
- free(base64_key);
+ TALLOC_FREE(base64_ticket);
+ TALLOC_FREE(base64_key);
return result;
}
extern userdom_struct current_user_info;
extern struct current_user current_user;
DATA_BLOB ticket;
- pstring afs_username;
- char *cell;
+ char *afs_username = NULL;
+ char *cell = NULL;
bool result;
- char *ticket_str;
+ char *ticket_str = NULL;
const DOM_SID *user_sid;
+ TALLOC_CTX *ctx = talloc_tos();
struct ClearToken ct;
- pstrcpy(afs_username, lp_afs_username_map());
- standard_sub_advanced(SNUM(conn), conn->user,
- conn->connectpath, conn->gid,
- get_current_username(),
- current_user_info.domain,
- afs_username, sizeof(afs_username));
+ afs_username = talloc_strdup(ctx,
+ lp_afs_username_map());
+ if (!afs_username) {
+ return false;
+ }
+
+ afs_username = talloc_sub_advanced(ctx,
+ SNUM(conn), conn->user,
+ conn->connectpath, conn->gid,
+ get_current_username(),
+ current_user_info.domain,
+ afs_username);
+ if (!afs_username) {
+ return false;
+ }
user_sid = ¤t_user.nt_user_token->user_sids[0];
- pstring_sub(afs_username, "%s", sid_string_static(user_sid));
+ afs_username = talloc_string_sub(talloc_tos(),
+ afs_username,
+ "%s",
+ sid_string_tos(user_sid));
+ if (!afs_username) {
+ return false;
+ }
/* The pts command always generates completely lower-case user
* names. */
if (cell == NULL) {
DEBUG(1, ("AFS username doesn't contain a @, "
"could not find cell\n"));
- return False;
+ return false;
}
*cell = '\0';
cell += 1;
- DEBUG(10, ("Trying to log into AFS for user %s@%s\n",
+ DEBUG(10, ("Trying to log into AFS for user %s@%s\n",
afs_username, cell));
if (!afs_createtoken(afs_username, cell, &ticket, &ct))