diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2002-10-01 13:10:57 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2002-10-01 13:10:57 +0000 |
| commit | ad8a22e570c8970247dc76defc9be2b768bd102d (patch) | |
| tree | e672142a6c857da134cc893e5ebe7cef08791d19 /source3/libads | |
| parent | 8147df0b6b4674670e70b45c603e8323e5c61c33 (diff) | |
| download | samba-ad8a22e570c8970247dc76defc9be2b768bd102d.tar.gz samba-ad8a22e570c8970247dc76defc9be2b768bd102d.tar.bz2 samba-ad8a22e570c8970247dc76defc9be2b768bd102d.zip | |
Updates from Samba HEAD:
- Fix segfaults in the 'net ads' commands when no password is provided
- Readd --with-ldapsam for 2.2 compatability. This conditionally compiles the
old options, but the actual code is available on all ldap systems.
- Fix shadow passwords (as per work with vl)
- Fix sending plaintext passwords to unicode servers (again vl)
- Add a bit of const to secrets.c functions
- Fix some spelling and grammer by vance.
- Document the -r option in smbgroupedit.
There are more changes in HEAD, I'm only merging the changes I've been involved
with.
Andrew Bartlett
(This used to be commit 83973c389355a5cc9ca74af467dfd8b5dabd2c8f)
Diffstat (limited to 'source3/libads')
| -rw-r--r-- | source3/libads/kerberos.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c index a80837cf4d..b586d84226 100644 --- a/source3/libads/kerberos.c +++ b/source3/libads/kerberos.c @@ -114,7 +114,14 @@ int ads_kinit_password(ADS_STRUCT *ads) char *s; int ret; - asprintf(&s, "%s@%s", ads->auth.user_name, ads->auth.realm); + if (asprintf(&s, "%s@%s", ads->auth.user_name, ads->auth.realm) == -1) { + return KRB5_CC_NOMEM; + } + + if (!ads->auth.password) { + return KRB5_LIBOS_CANTREADPWD; + } + ret = kerberos_kinit_password(s, ads->auth.password, ads->auth.time_offset); if (ret) { |