diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-03-17 14:04:43 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-04-14 12:11:00 +1000 |
| commit | 4786a493f70070dce6de4cbe488c9de1bdbb75ad (patch) | |
| tree | a568260a9cf5d255674d0e31dddf4f5e3644e0da /source3/libsmb/smbencrypt.c | |
| parent | 41e4f12c482082d6e622d1fdc830e38853cdbd8b (diff) | |
| download | samba-4786a493f70070dce6de4cbe488c9de1bdbb75ad.tar.gz samba-4786a493f70070dce6de4cbe488c9de1bdbb75ad.tar.bz2 samba-4786a493f70070dce6de4cbe488c9de1bdbb75ad.zip | |
Solve some of the conflict between Samba3 and Samba4 push_string
This renames push_string in Samba3 into push_string_base and
push_string_check for the two different use cases.
This should allow push_string to be imported from Samba4, using it's
calling conventions.
Diffstat (limited to 'source3/libsmb/smbencrypt.c')
| -rw-r--r-- | source3/libsmb/smbencrypt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/libsmb/smbencrypt.c b/source3/libsmb/smbencrypt.c index ee162b1b2d..a76be3cc1a 100644 --- a/source3/libsmb/smbencrypt.c +++ b/source3/libsmb/smbencrypt.c @@ -499,9 +499,9 @@ bool encode_pw_buffer(uint8 buffer[516], const char *password, int string_flags) /* the incoming buffer can be any alignment. */ string_flags |= STR_NOALIGN; - new_pw_len = push_string(NULL, new_pw, - password, - sizeof(new_pw), string_flags); + new_pw_len = push_string_check(new_pw, + password, + sizeof(new_pw), string_flags); memcpy(&buffer[512 - new_pw_len], new_pw, new_pw_len); |