diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-03-09 13:51:52 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-03-09 13:51:52 +0100 |
| commit | acc63121ac94ce50495213636b66cf0667c359ff (patch) | |
| tree | f4247aa8b43041a4fbbaae474dedcb70df12904f /source3/smbd | |
| parent | 5b8823e49ac6601ffe4b06495b3e7a95e2337090 (diff) | |
| parent | 87805819f108f0d2a7376ca78952a6e6a36bc6db (diff) | |
| download | samba-acc63121ac94ce50495213636b66cf0667c359ff.tar.gz samba-acc63121ac94ce50495213636b66cf0667c359ff.tar.bz2 samba-acc63121ac94ce50495213636b66cf0667c359ff.zip | |
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
(This used to be commit 09e5c6adde5564afc0d1be25f297fbfd284d559f)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/trans2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index dc908846b3..008ffed5a1 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -3189,7 +3189,7 @@ cap_low = 0x%x, cap_high = 0x%x\n", } DEBUG( 4,("call_trans2setfsinfo: " - "request transport encrption.\n")); + "request transport encryption.\n")); status = srv_request_encryption_setup(conn, (unsigned char **)ppdata, |