diff options
| author | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2014-10-29 12:22:32 +0000 |
|---|---|---|
| committer | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2014-10-29 12:22:32 +0000 |
| commit | 1cb587dc9cc4823efd6554322e173382a120664d (patch) | |
| tree | 77516c53f56a5d5cd356235de1aeead84b5b93ad /usr.sbin/ctld | |
| parent | dbb1ee18ccdfb0a5afd50d5094177fef50a461d1 (diff) | |
| download | src-1cb587dc9cc4823efd6554322e173382a120664d.tar.gz src-1cb587dc9cc4823efd6554322e173382a120664d.zip | |
Fix iscsictl(8) and ctld(8) to correctly handle Windows newlines
(CRLF) in iscsi.conf and ctl.conf.
MFC after: 1 month
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/head/; revision=273822
Diffstat (limited to 'usr.sbin/ctld')
| -rw-r--r-- | usr.sbin/ctld/token.l | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/usr.sbin/ctld/token.l b/usr.sbin/ctld/token.l index b63ce421a8b1..822d1ac7e333 100644 --- a/usr.sbin/ctld/token.l +++ b/usr.sbin/ctld/token.l @@ -82,6 +82,7 @@ timeout { return TIMEOUT; } \{ { return OPENING_BRACKET; } \} { return CLOSING_BRACKET; } #.*$ /* ignore comments */; +\r\n { lineno++; } \n { lineno++; } ; { return SEMICOLON; } [ \t]+ /* ignore whitespace */; |