Skip to content

Commit

Permalink
sysoptions.h: move keepalive string above ident
Browse files Browse the repository at this point in the history
OpenWrt package removes Dropbear version from ident string.
Until now, that was done with sed, instead of a patch.

I'm trying to change that to a patch and I noticed that the version string
is defined only 3 lines above the ident string. A normal patch would
include that line. Any version change would invalidate the patch.

I moved the keepalive string just above the ident string,
as these are somewhat related. That will keep the version string outside
the patch.

Signed-off-by: Marius Dinu <m95d+git@psihoexpert.ro>
  • Loading branch information
M95D committed May 15, 2024
1 parent edb2778 commit 54bb47f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/sysoptions.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
#define DROPBEAR_VERSION "2024.85"
#endif

/* Use this string since some implementations might special-case it */
#define DROPBEAR_KEEPALIVE_STRING "keepalive@openssh.com"

#define LOCAL_IDENT "SSH-2.0-dropbear_" DROPBEAR_VERSION
#define PROGNAME "dropbear"

Expand Down Expand Up @@ -365,9 +368,6 @@
/* free memory before exiting */
#define DROPBEAR_CLEANUP 1

/* Use this string since some implementations might special-case it */
#define DROPBEAR_KEEPALIVE_STRING "keepalive@openssh.com"

/* Linux will attempt TCP fast open, falling back if not supported by the kernel.
* Currently server is enabled but client is disabled by default until there
* is further compatibility testing */
Expand Down

0 comments on commit 54bb47f

Please sign in to comment.