diff options
author | Luke Leighton <lkcl@samba.org> | 1999-10-07 22:10:29 +0000 |
---|---|---|
committer | Luke Leighton <lkcl@samba.org> | 1999-10-07 22:10:29 +0000 |
commit | cba7662da1fd9ed8bd9f9969417adf1fe5f0d33b (patch) | |
tree | eae7890b1c9c03c86e86dd86a2966fc5a585b99a /source3/lib | |
parent | eb9268550f2330d4a9a3381f560bd7d70743e19a (diff) | |
download | samba-cba7662da1fd9ed8bd9f9969417adf1fe5f0d33b.tar.gz samba-cba7662da1fd9ed8bd9f9969417adf1fe5f0d33b.tar.bz2 samba-cba7662da1fd9ed8bd9f9969417adf1fe5f0d33b.zip |
- added rudimentary CAP_UNICODE support because i thought it was part of
a problem i was having.
- added rudimentary CAP_STATUS32 support for same reason.
- added hard-coded, copy-the-same-data-from-over-the-wire version of
CAP_EXTENDED_SECURITY, which is a security-blob to encapsulate
GSSAPI which encodes
SPNEGO which is used to negotiate
Kerberos or NTLMSSP. i have implemented
NTLMSSP which negotiates
NTLMv1 or NTLMv2 and 40-bit or 128-bit etc. i have implemented
NTLMv1 / 40-bit.
*whew*.
(This used to be commit e5b80bd2f76fda70e41e4a9007eb035dab92ed8e)
Diffstat (limited to 'source3/lib')
-rw-r--r-- | source3/lib/util_str.c | 2 | ||||
-rw-r--r-- | source3/lib/util_unistr.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c index 4c6a993777..636be164ac 100644 --- a/source3/lib/util_str.c +++ b/source3/lib/util_str.c @@ -462,7 +462,7 @@ char *skip_string(char *buf,size_t n) { while (n--) buf += strlen(buf) + 1; - return(buf); + return buf; } /******************************************************************* diff --git a/source3/lib/util_unistr.c b/source3/lib/util_unistr.c index 4e7872021b..e047697a0f 100644 --- a/source3/lib/util_unistr.c +++ b/source3/lib/util_unistr.c @@ -51,8 +51,7 @@ char *ascii_to_unibuf(char *dest, const char *src, int maxlen) /******************************************************************* Pull an ASCII string out of a UNICODE buffer (little endian). ********************************************************************/ - -void unibuf_to_ascii(char *dest, const char *src, int maxlen) +const char *unibuf_to_ascii(char *dest, const char *src, int maxlen) { char *destend = dest + maxlen; register char c; @@ -70,6 +69,8 @@ void unibuf_to_ascii(char *dest, const char *src, int maxlen) } *dest = 0; + + return src; } |