| /tags/2.1-4/debian/patches/blacklist.patch |
|---|
| 206,7 → 206,7 |
| +} |
| --- a/src/dsa.c |
| +++ b/src/dsa.c |
| @@ -189,6 +189,14 @@ do_dsa_public_spki_key(struct verifier * |
| @@ -187,6 +187,14 @@ do_dsa_public_spki_key(struct verifier * |
| "y", self->key.y); |
| } |
| 221,7 → 221,7 |
| static void |
| init_dsa_verifier(struct dsa_verifier *self) |
| { |
| @@ -199,6 +207,7 @@ init_dsa_verifier(struct dsa_verifier *s |
| @@ -197,6 +205,7 @@ init_dsa_verifier(struct dsa_verifier *s |
| self->super.verify = do_dsa_verify; |
| self->super.public_spki_key = do_dsa_public_spki_key; |
| self->super.public_key = do_dsa_public_key; |
| /tags/2.1-4/debian/patches/new-readline-completion-function-typedef.patch |
|---|
| 0,0 → 1,11 |
| --- a/src/sftp/rl.c |
| +++ b/src/sftp/rl.c |
| @@ -116,7 +116,7 @@ void lsftp_rl_init() |
| rl_basic_word_break_characters =" \n\t"; /* Only whitespace break words */ |
| RL_CHAR_IS_QUOTED = char_quoted; |
| - rl_attempted_completion_function = (CPPFunction *)lsftp_rl_completion; |
| + rl_attempted_completion_function = (rl_completion_func_t *)lsftp_rl_completion; |
| interactive = 1; /* Set the interactive flag in the main program */ |
| /tags/2.1-4/debian/patches/rl_completion-segfault.patch |
|---|
| 0,0 → 1,37 |
| Author: Magnus Holmgren |
| Description: Avoid crashing when tab-completing an empty command line in lsftp |
| The problem was that lsftp_s_skip returns NULL if nothing but |
| separator characters are found, and that case wasn't handled. |
| --- a/src/sftp/rl.c |
| +++ b/src/sftp/rl.c |
| @@ -205,7 +205,7 @@ int char_quoted( char* text, int index ) |
| char** lsftp_rl_completion(char* text, int start, int end) |
| { |
| char** matches=NULL; |
| - int s; |
| + const char *s; |
| /* If this word is at the start of the line, then it is a command to |
| * complete. |
| @@ -213,9 +213,9 @@ char** lsftp_rl_completion(char* text, i |
| rl_completion_append_character = ' '; /* Trailing space after word */ |
| - s = lsftp_s_skip( rl_line_buffer, " \n\t\r" ) - rl_line_buffer; |
| + s = lsftp_s_skip( rl_line_buffer, " \n\t\r" ); |
| - if ( start == s ) /* The first word should be a command, even with spaces in front */ |
| + if ( !s || rl_line_buffer + start == s ) /* The first word should be a command, even with spaces in front */ |
| { |
| matches = RL_COMPLETION_MATCHES( |
| text, |
| @@ -231,7 +231,7 @@ char** lsftp_rl_completion(char* text, i |
| /* Get the first word from the line (the command) */ |
| - lsftp_s_strtok( rl_line_buffer+s," \n\t\r", &tmp ); |
| + lsftp_s_strtok( s," \n\t\r", &tmp ); |
| while( (cmdname = commands[i].name) ) |
| { |
| /tags/2.1-4/debian/patches/series |
|---|
| 1,2 → 1,4 |
| sftp-server-mansection.patch |
| blacklist.patch |
| new-readline-completion-function-typedef.patch |
| rl_completion-segfault.patch |
| /tags/2.1-4/debian/patches/sftp-server-mansection.patch |
|---|
| 2,9 → 2,8 |
| (To avoid conflicts without having to rename the sftp-server binary.) |
| Author: Magnus Holmgren <holmgren@debian.org> |
| diff -urNad trunk~/src/sftp/sftp-server.8 trunk/src/sftp/sftp-server.8 |
| --- trunk~/src/sftp/sftp-server.8 2006-05-08 21:11:17.000000000 +0200 |
| +++ trunk/src/sftp/sftp-server.8 2007-10-03 20:48:35.000000000 +0200 |
| --- a/src/sftp/sftp-server.8 |
| +++ b/src/sftp/sftp-server.8 |
| @@ -22,7 +22,7 @@ |
| .\" maintainers of the package you received this manual from and make your |
| .\" modified versions available to them. |