diff options
author | Andrew Bartlett <abartlet@samba.org> | 2006-03-22 10:16:59 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:59:02 -0500 |
commit | 864d9b531dc2fba94f5ea839b087e28d402c643a (patch) | |
tree | 91f72ed27956be3c0d536d725b0505cba35e3adb /source4/heimdal/lib/krb5/get_for_creds.c | |
parent | 4fd82be1403f873f67eecb8fee457b8de9fc5cd1 (diff) | |
download | samba-864d9b531dc2fba94f5ea839b087e28d402c643a.tar.gz samba-864d9b531dc2fba94f5ea839b087e28d402c643a.tar.bz2 samba-864d9b531dc2fba94f5ea839b087e28d402c643a.zip |
r14635: - Remove lex.c from SVN (it is built anyway, and having it in SVN
confuses things)
- Update Samba4 from lorikeet-heimdal
- Remove generated symlink on make clean
Andrew Bartlett
(This used to be commit a5c2b4cc92e807d18cb8df99bebf004fa4252e1e)
Diffstat (limited to 'source4/heimdal/lib/krb5/get_for_creds.c')
-rw-r--r-- | source4/heimdal/lib/krb5/get_for_creds.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/heimdal/lib/krb5/get_for_creds.c b/source4/heimdal/lib/krb5/get_for_creds.c index aa7c62befc..dafe668b5d 100644 --- a/source4/heimdal/lib/krb5/get_for_creds.c +++ b/source4/heimdal/lib/krb5/get_for_creds.c @@ -33,7 +33,7 @@ #include <krb5_locl.h> -RCSID("$Id: get_for_creds.c,v 1.47 2006/02/03 11:37:29 lha Exp $"); +RCSID("$Id: get_for_creds.c,v 1.48 2006/03/07 19:38:09 lha Exp $"); static krb5_error_code add_addrs(krb5_context context, @@ -50,7 +50,7 @@ add_addrs(krb5_context context, ++n; tmp = realloc(addr->val, (addr->len + n) * sizeof(*addr->val)); - if (tmp == NULL) { + if (tmp == NULL && (addr->len + n) != 0) { krb5_set_error_string(context, "malloc: out of memory"); ret = ENOMEM; goto fail; |