diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-12-23 22:12:23 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-12-23 22:12:23 +0100 |
| commit | 5c75b65ca15f7c71babd835a45b252fed6534acf (patch) | |
| tree | 6b8baa3f5d27c4eafd89fece7deedae30a6ff1fd /source3/libnet/libnet_join.c | |
| parent | 86cee0b28c50dd849fe919bbe3faa4deba5275bf (diff) | |
| parent | ff26cb4b1c1d0292231e1cfc0490f4be6040d3e3 (diff) | |
| download | samba-5c75b65ca15f7c71babd835a45b252fed6534acf.tar.gz samba-5c75b65ca15f7c71babd835a45b252fed6534acf.tar.xz samba-5c75b65ca15f7c71babd835a45b252fed6534acf.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/libnet/libnet_join.c')
| -rw-r--r-- | source3/libnet/libnet_join.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c index 691f6ff8eb..51d979074b 100644 --- a/source3/libnet/libnet_join.c +++ b/source3/libnet/libnet_join.c @@ -1019,8 +1019,7 @@ NTSTATUS libnet_join_ok(const char *netbios_domain_name, return NT_STATUS_NO_TRUST_LSA_SECRET; } - asprintf(&machine_account, "%s$", machine_name); - if (!machine_account) { + if (asprintf(&machine_account, "%s$", machine_name) == -1) { SAFE_FREE(machine_password); return NT_STATUS_NO_MEMORY; } |